diff --git a/Gemfile b/Gemfile index 064057969..f38228f43 100644 --- a/Gemfile +++ b/Gemfile @@ -93,7 +93,7 @@ end gem 'rack-test' # gem 'rb-fsevent', '0.9.1', :require => false # gem 'growl', '1.0.3' - gem 'poltergeist' + gem 'poltergeist', '1.3.0' # can't go to 1.4.0 until this is fixed https://github.com/jonleighton/poltergeist/issues/385 end group :production do diff --git a/app/controllers/api_users_controller.rb b/app/controllers/api_users_controller.rb index a663bcec2..3b471097c 100644 --- a/app/controllers/api_users_controller.rb +++ b/app/controllers/api_users_controller.rb @@ -67,9 +67,7 @@ class ApiUsersController < ApiController @user.musician = params[:musician] if params.has_key?(:musician) @user.update_instruments(params[:instruments].nil? ? [] : params[:instruments]) if params.has_key?(:instruments) - puts params[:birth_date] @user.save - puts @user.birth_date.inspect if @user.errors.any? respond_with @user, :status => :unprocessable_entity diff --git a/build b/build index 05e12fa06..d694cfd6b 100755 --- a/build +++ b/build @@ -13,8 +13,8 @@ rm -rf vendor/bundle rm -rf tmp/capybara rm Gemfile.lock # if we don't want versions to float, pin it in the Gemfile, not count on Gemfile.lock # put all dependencies into vendor/bundle -bundle install --path vendor/bundle -bundle update +bundle install --path vendor/bundle --local +#bundle update # clean assets, because they may be lingering from last build bundle exec rake assets:clean @@ -101,7 +101,7 @@ EOF set -e # cache all gems local, and tell bundle to use local gems only - bundle install --path vendor/bundle --local + #bundle install --path vendor/bundle --local # prepare production acssets rm -rf $DIR/public/assets bundle exec rake assets:precompile RAILS_ENV=production