From acd1837a9e2f0dc12fefab15bb76f633ececd6bb Mon Sep 17 00:00:00 2001
From: "Butler, Alexis (UG - Computer Science)" <ab02259@surrey.ac.uk>
Date: Fri, 7 May 2021 11:29:38 +0100
Subject: [PATCH] Fixed Rails Env loading race condition
---
Gemfile | 1 +
config/application.rb | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/Gemfile b/Gemfile
index 4cae2af..b608f47 100644
--- a/Gemfile
+++ b/Gemfile
@@ -74,6 +74,7 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
# Additional Project Gems
#
#Have to use feature branch because devise is yet to be patched for omniauth 2 - https://github.com/heartcombo/devise/pull/5327
+gem 'dotenv-rails', require: 'dotenv/rails-now'
gem 'devise', github: 'heartcombo/devise', branch: 'ca-omniauth-2'
gem 'omniauth-facebook'
gem 'omniauth-google-oauth2'
diff --git a/config/application.rb b/config/application.rb
index 9ca9b27..4f86347 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -6,12 +6,12 @@ require 'rails/all'
# Require the gems listed in Gemfile, including any gems
# you've limited to :test, :development, or :production.
Bundler.require(*Rails.groups)
+Dotenv::Railtie.load
module Group10HabitTracker
class Application < Rails::Application
# Initialize configuration defaults for originally generated Rails version.
config.load_defaults 5.2
-
# Settings in config/environments/* take precedence over those specified here.
# Application configuration can go into files in config/initializers
# -- all .rb files in that directory are automatically loaded after loading
--
GitLab