diff --git a/.gitignore b/.gitignore index 65877ba8fb..f295094890 100644 --- a/.gitignore +++ b/.gitignore @@ -32,7 +32,6 @@ public/stylesheets public/images public/spree config/abr.yml -config/heroku_env.rb config/newrelic.yml config/initializers/feature_toggle.rb config/initializers/db2fog.rb diff --git a/config/database.yml b/config/database.yml index 7eef2396f9..7f55b6c499 100644 --- a/config/database.yml +++ b/config/database.yml @@ -16,7 +16,6 @@ test: username: ofn password: f00d -#not used with heroku production: adapter: postgresql encoding: unicode diff --git a/config/environments/development.rb b/config/environments/development.rb index f8a177076f..22bf2a1945 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -35,8 +35,3 @@ Openfoodnetwork::Application.configure do config.action_mailer.delivery_method = :letter_opener config.action_mailer.default_url_options = { host: "0.0.0.0:3000" } end - - -# Load heroku vars from local file -heroku_env = File.join(Rails.root, 'config', 'heroku_env.rb') -load(heroku_env) if File.exists?(heroku_env)