Merge branch 'hotfix/v1.7.0-hotfix-1'

odinsride · Aug 6, 2020 · 34dd0cb · 34dd0cb
2 parents 3c94592 + 54703e4
commit 34dd0cb
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add pending rubocop cops
 - Massive improvement to seeds file
 - Navbar now displays the rails environment (non-production only)
+- Upgrade to Fontawesome 5
 - Dependencies updated
 
 ## [v1.6.4] - 2020-05-17

diff --git a/Gemfile b/Gemfile
@@ -14,11 +14,13 @@ gem 'devise', '~> 4.7.2'
 gem 'draper', '~> 4.0.1'
 gem 'faker', '~> 2.12.0'
 gem 'figaro', '~> 1.2.0'
+gem 'hiredis'
 gem 'mini_magick', '~> 4.10.1'
 gem 'pagy', '~> 3.8.2'
 gem 'pg', '~> 1.2.3'
 gem 'puma', '~> 4.3.5'
 gem 'rails', '~> 6.0.3.2'
+gem 'redis', '>= 4.0', :require => ['redis', 'redis/connection/hiredis']
 gem 'stimulus_reflex', '~> 3.2.3'
 gem 'webpacker', '~> 5.1.1'
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -130,6 +130,7 @@ GEM
       thor (>= 0.14.0, < 2)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
+    hiredis (0.6.3)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     jmespath (1.4.0)
@@ -209,6 +210,7 @@ GEM
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
+    redis (4.2.1)
     regexp_parser (1.7.1)
     request_store (1.5.0)
       rack (>= 1.4)
@@ -307,6 +309,7 @@ DEPENDENCIES
   factory_bot_rails (~> 6.0.0)
   faker (~> 2.12.0)
   figaro (~> 1.2.0)
+  hiredis
   listen
   mini_magick (~> 4.10.1)
   pagy (~> 3.8.2)
@@ -316,6 +319,7 @@ DEPENDENCIES
   puma (~> 4.3.5)
   rails (~> 6.0.3.2)
   rails-controller-testing (~> 1.0.4)
+  redis (>= 4.0)
   rspec-rails (~> 4.0.1)
   rubocop
   rubocop-rails

diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -56,7 +56,12 @@
   config.log_tags = [:request_id]
 
   # Use a different cache store in production.
-  # config.cache_store = :mem_cache_store
+  config.cache_store = :redis_cache_store, {url: ENV.fetch('REDIS_URL')}
+  config.session_store :cache_store,
+    key: "_session",
+    compress: true,
+    pool_size: 5,
+    expire_after: 1.year
 
   # Use a real queuing backend for Active Job (and separate queues per environment)
   # config.active_job.queue_adapter     = :resque