Remove dotenv-deployment, upgrade dotenv-rails
Idk exactly what's going on with dotenv-deployment, if it turns out it was critical to our deploy process then we'll change the deploy process! It's deprecated and conflicts with gem deps for `dotenv-rails`.
This commit is contained in:
parent
855057dee2
commit
e94c03b01f
8 changed files with 6 additions and 9 deletions
3
Gemfile
3
Gemfile
|
@ -8,8 +8,7 @@ gem 'mysql2', '>= 0.3.11'
|
||||||
|
|
||||||
# For reading the .env file, which you can use in development to more easily
|
# For reading the .env file, which you can use in development to more easily
|
||||||
# set environment variables for secret data.
|
# set environment variables for secret data.
|
||||||
gem 'dotenv-rails'
|
gem 'dotenv-rails', '~> 2.8', '>= 2.8.1'
|
||||||
gem 'dotenv-deployment'
|
|
||||||
|
|
||||||
# For the asset pipeline: templates, CSS, JS, etc.
|
# For the asset pipeline: templates, CSS, JS, etc.
|
||||||
gem 'haml', '~> 6.1', '>= 6.1.1'
|
gem 'haml', '~> 6.1', '>= 6.1.1'
|
||||||
|
|
11
Gemfile.lock
11
Gemfile.lock
|
@ -81,10 +81,10 @@ GEM
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
warden (~> 1.2.3)
|
warden (~> 1.2.3)
|
||||||
diff-lcs (1.2.5)
|
diff-lcs (1.2.5)
|
||||||
dotenv (2.0.1)
|
dotenv (2.8.1)
|
||||||
dotenv-deployment (0.0.2)
|
dotenv-rails (2.8.1)
|
||||||
dotenv-rails (2.0.1)
|
dotenv (= 2.8.1)
|
||||||
dotenv (= 2.0.1)
|
railties (>= 3.2)
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
execjs (2.5.2)
|
execjs (2.5.2)
|
||||||
factory_girl (2.6.4)
|
factory_girl (2.6.4)
|
||||||
|
@ -219,8 +219,7 @@ DEPENDENCIES
|
||||||
capistrano (~> 2.15.5)
|
capistrano (~> 2.15.5)
|
||||||
compass-rails (~> 3.1)
|
compass-rails (~> 3.1)
|
||||||
devise (~> 3.5.10)
|
devise (~> 3.5.10)
|
||||||
dotenv-deployment
|
dotenv-rails (~> 2.8, >= 2.8.1)
|
||||||
dotenv-rails
|
|
||||||
factory_girl_rails (~> 1.0)
|
factory_girl_rails (~> 1.0)
|
||||||
globalize (~> 4.0.3)
|
globalize (~> 4.0.3)
|
||||||
haml (~> 6.1, >= 6.1.1)
|
haml (~> 6.1, >= 6.1.1)
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
require "bundler/capistrano"
|
require "bundler/capistrano"
|
||||||
require "dotenv/deployment/capistrano"
|
|
||||||
require "rvm/capistrano"
|
require "rvm/capistrano"
|
||||||
|
|
||||||
set :application, "newimpress.openneo.net"
|
set :application, "newimpress.openneo.net"
|
||||||
|
|
BIN
vendor/cache/dotenv-2.0.1.gem
vendored
BIN
vendor/cache/dotenv-2.0.1.gem
vendored
Binary file not shown.
BIN
vendor/cache/dotenv-2.8.1.gem
vendored
Normal file
BIN
vendor/cache/dotenv-2.8.1.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/dotenv-deployment-0.0.2.gem
vendored
BIN
vendor/cache/dotenv-deployment-0.0.2.gem
vendored
Binary file not shown.
BIN
vendor/cache/dotenv-rails-2.0.1.gem
vendored
BIN
vendor/cache/dotenv-rails-2.0.1.gem
vendored
Binary file not shown.
BIN
vendor/cache/dotenv-rails-2.8.1.gem
vendored
Normal file
BIN
vendor/cache/dotenv-rails-2.8.1.gem
vendored
Normal file
Binary file not shown.
Loading…
Reference in a new issue