diff --git a/Gemfile b/Gemfile index a9b7ca65..efafc12d 100644 --- a/Gemfile +++ b/Gemfile @@ -8,8 +8,7 @@ gem 'mysql2', '>= 0.3.11' # For reading the .env file, which you can use in development to more easily # set environment variables for secret data. -gem 'dotenv-rails' -gem 'dotenv-deployment' +gem 'dotenv-rails', '~> 2.8', '>= 2.8.1' # For the asset pipeline: templates, CSS, JS, etc. gem 'haml', '~> 6.1', '>= 6.1.1' diff --git a/Gemfile.lock b/Gemfile.lock index 3c5d042d..8af4ad77 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -81,10 +81,10 @@ GEM thread_safe (~> 0.1) warden (~> 1.2.3) diff-lcs (1.2.5) - dotenv (2.0.1) - dotenv-deployment (0.0.2) - dotenv-rails (2.0.1) - dotenv (= 2.0.1) + dotenv (2.8.1) + dotenv-rails (2.8.1) + dotenv (= 2.8.1) + railties (>= 3.2) erubis (2.7.0) execjs (2.5.2) factory_girl (2.6.4) @@ -219,8 +219,7 @@ DEPENDENCIES capistrano (~> 2.15.5) compass-rails (~> 3.1) devise (~> 3.5.10) - dotenv-deployment - dotenv-rails + dotenv-rails (~> 2.8, >= 2.8.1) factory_girl_rails (~> 1.0) globalize (~> 4.0.3) haml (~> 6.1, >= 6.1.1) diff --git a/config/deploy.rb b/config/deploy.rb index cbea6a07..dda33c61 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,5 +1,4 @@ require "bundler/capistrano" -require "dotenv/deployment/capistrano" require "rvm/capistrano" set :application, "newimpress.openneo.net" diff --git a/vendor/cache/dotenv-2.0.1.gem b/vendor/cache/dotenv-2.0.1.gem deleted file mode 100644 index a999069a..00000000 Binary files a/vendor/cache/dotenv-2.0.1.gem and /dev/null differ diff --git a/vendor/cache/dotenv-2.8.1.gem b/vendor/cache/dotenv-2.8.1.gem new file mode 100644 index 00000000..1e952071 Binary files /dev/null and b/vendor/cache/dotenv-2.8.1.gem differ diff --git a/vendor/cache/dotenv-deployment-0.0.2.gem b/vendor/cache/dotenv-deployment-0.0.2.gem deleted file mode 100644 index 30876f95..00000000 Binary files a/vendor/cache/dotenv-deployment-0.0.2.gem and /dev/null differ diff --git a/vendor/cache/dotenv-rails-2.0.1.gem b/vendor/cache/dotenv-rails-2.0.1.gem deleted file mode 100644 index bef024f9..00000000 Binary files a/vendor/cache/dotenv-rails-2.0.1.gem and /dev/null differ diff --git a/vendor/cache/dotenv-rails-2.8.1.gem b/vendor/cache/dotenv-rails-2.8.1.gem new file mode 100644 index 00000000..1aab6b48 Binary files /dev/null and b/vendor/cache/dotenv-rails-2.8.1.gem differ