From 1d12aed3ebf206f796a083c3e076f6acc35e930a Mon Sep 17 00:00:00 2001
From: Devin Howard <devin@callysto.com>
Date: Tue, 7 Jun 2016 12:55:49 +0800
Subject: [PATCH] switch to dotenv-rails

---
 Gemfile               |  2 +-
 Gemfile.lock          | 10 ++++++++--
 config/application.rb |  4 ----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index 815c5eee..07159461 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,7 +10,7 @@ gem 'delayed_job', '~> 4.0.2'
 gem 'delayed_job_active_record', '~> 4.0.1'
 gem 'devise'
 gem 'doorkeeper'
-gem 'dotenv'
+gem 'dotenv-rails'
 gem 'exception_notification'
 gem 'formtastic'
 gem 'formula'
diff --git a/Gemfile.lock b/Gemfile.lock
index 87e56f79..c1cf8409 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -87,7 +87,10 @@ GEM
     docile (1.1.5)
     doorkeeper (3.1.0)
       railties (>= 3.2)
-    dotenv (2.1.0)
+    dotenv (2.1.1)
+    dotenv-rails (2.1.1)
+      dotenv (= 2.1.1)
+      railties (>= 4.0, < 5.1)
     erubis (2.7.0)
     exception_notification (4.1.4)
       actionmailer (~> 4.0)
@@ -273,7 +276,7 @@ DEPENDENCIES
   delayed_job_active_record (~> 4.0.1)
   devise
   doorkeeper
-  dotenv
+  dotenv-rails
   exception_notification
   factory_girl_rails
   formtastic
@@ -306,3 +309,6 @@ DEPENDENCIES
   tunemygc
   uglifier
   uservoice-ruby
+
+BUNDLED WITH
+   1.11.2
diff --git a/config/application.rb b/config/application.rb
index 0431e58b..570b6959 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -2,13 +2,9 @@ require File.expand_path('../boot', __FILE__)
 
 require 'csv'
 require 'rails/all'
-require 'dotenv'
 
 Bundler.require(*Rails.groups)
 
-ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
-Dotenv.load ".env.#{ENV["RAILS_ENV"]}", '.env'
-
 module Metamaps
   class Application < Rails::Application
     config.active_job.queue_adapter = :delayed_job