Allows deploying branches in preproduction

Bundle install
This commit is contained in:
kikito
2016-01-13 11:32:52 +01:00
parent 5ea8d76903
commit f262686023
2 changed files with 1 additions and 11 deletions

View File

@@ -357,16 +357,6 @@ GEM
sprockets (>= 2.8, < 4.0) sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0) sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3) 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) savon (2.11.1)
akami (~> 1.2) akami (~> 1.2)
builder (>= 2.1.2) builder (>= 2.1.2)

View File

@@ -1,7 +1,7 @@
set :deploy_to, deploysecret(:deploy_to) set :deploy_to, deploysecret(:deploy_to)
set :server_name, deploysecret(:server_name) set :server_name, deploysecret(:server_name)
set :db_server, deploysecret(:db_server) set :db_server, deploysecret(:db_server)
set :branch, :master set :branch, ENV['branch'] || :master
set :ssh_options, port: deploysecret(:ssh_port) set :ssh_options, port: deploysecret(:ssh_port)
set :stage, :preproduction set :stage, :preproduction
set :rails_env, :preproduction set :rails_env, :preproduction