Move server/ to waiter/

Apparently server dir conflicts with some scripts in ember-cli
2015-02-03 10:12:53 +01:00 · 2015-02-03 10:12:53 +01:00 · 8959f382c2
commit 8959f382c2
parent 9a70e8d8f7
22 changed files with 2 additions and 2 deletions
--- a/2
+++ b/2
@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 ruby '2.1.2'

-gem 'travis-web', path: 'server'
+gem 'travis-web', path: 'waiter'
 gem 'puma'
 gem 'rack-ssl', '~> 1.3'
 gem 'rack-protection', '~> 1.3'
--- a/2
+++ b/2
@ -1,3 +1,3 @@
-web: bundle exec rackup -s puma -p $PORT server/config.ru
+web: bundle exec rackup -s puma -p $PORT waiter/config.ru
 assets: rerun -x -p 'assets/**/*' 'bundle exec rakep'
 #specs: rerun -x -p 'public/**/*' './run_jasmine.coffee public/spec.html'
--- a/waiter/Rakefile
+++ b/waiter/Rakefile
--- a/waiter/config.ru
+++ b/waiter/config.ru
--- a/waiter/lib/travis/web.rb
+++ b/waiter/lib/travis/web.rb
--- a/waiter/lib/travis/web/allow.rb
+++ b/waiter/lib/travis/web/allow.rb
--- a/waiter/lib/travis/web/api_redirect.rb
+++ b/waiter/lib/travis/web/api_redirect.rb
--- a/waiter/lib/travis/web/app.rb
+++ b/waiter/lib/travis/web/app.rb
--- a/waiter/lib/travis/web/app/alt_versions.rb
+++ b/waiter/lib/travis/web/app/alt_versions.rb
--- a/waiter/lib/travis/web/app/mobile_redirect.rb
+++ b/waiter/lib/travis/web/app/mobile_redirect.rb
--- a/waiter/lib/travis/web/config.rb
+++ b/waiter/lib/travis/web/config.rb
--- a/waiter/lib/travis/web/set_token.rb
+++ b/waiter/lib/travis/web/set_token.rb
--- a/waiter/script/ci
+++ b/waiter/script/ci
--- a/waiter/script/prepare_deploy
+++ b/waiter/script/prepare_deploy
--- a/waiter/script/saucelabs.rb
+++ b/waiter/script/saucelabs.rb
--- a/waiter/script/server
+++ b/waiter/script/server
--- a/waiter/spec/allow_spec.rb
+++ b/waiter/spec/allow_spec.rb
--- a/waiter/spec/api_redirect_spec.rb
+++ b/waiter/spec/api_redirect_spec.rb
--- a/waiter/spec/app_spec.rb
+++ b/waiter/spec/app_spec.rb
--- a/waiter/spec/mobile_redirect_spec.rb
+++ b/waiter/spec/mobile_redirect_spec.rb
--- a/waiter/spec/spec_helper.rb
+++ b/waiter/spec/spec_helper.rb
--- a/waiter/travis-web.gemspec
+++ b/waiter/travis-web.gemspec