diff --git a/Gemfile.lock b/Gemfile.lock index 5b5a67d7c..50d0b6ad2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -357,16 +357,6 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sassc (1.8.3) - bundler - ffi (~> 1.9.6) - sass (>= 3.3.0) - sassc-rails (1.1.0) - rails (>= 4.0.0) - sass - sassc (~> 1.6) - sprockets (> 2.11) - tilt savon (2.11.1) akami (~> 1.2) builder (>= 2.1.2) diff --git a/config/deploy/preproduction.rb b/config/deploy/preproduction.rb index a514f84eb..16d1c5bb7 100644 --- a/config/deploy/preproduction.rb +++ b/config/deploy/preproduction.rb @@ -1,7 +1,7 @@ set :deploy_to, deploysecret(:deploy_to) set :server_name, deploysecret(:server_name) set :db_server, deploysecret(:db_server) -set :branch, :master +set :branch, ENV['branch'] || :master set :ssh_options, port: deploysecret(:ssh_port) set :stage, :preproduction set :rails_env, :preproduction