Adhoc fixes to get this branch working

Author: Kagemaru

Gemfile

@@ -2,17 +2,17 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 5.2.x'
 
-gem 'pg', '~> 0.21.0'
+gem 'pg', '= 0.21.0'
 gem 'activerecord-nulldb-adapter'
 
 gem 'nochmal', github: 'puzzle/nochmal'
 
 gem 'acts_as_tree'
 gem 'aws-sdk-s3', require: false
 gem 'bleib'
-gem 'bootsnap'
+gem 'bootsnap', '>= 1.4.6'
 gem 'cancancan'
-gem 'config'
+gem 'config', '>= 2.2.1'
 gem 'country_select'
 gem 'daemons'
 gem 'dalli'

Gemfile.lock

@@ -575,7 +575,7 @@ DEPENDENCIES
   better_errors
   binding_of_caller
   bleib
-  bootsnap
+  bootsnap (>= 1.4.6)
   bootstrap-sass
   brakeman
   bullet
@@ -585,7 +585,7 @@ DEPENDENCIES
   chartjs-ror
   codez-tarantula
   coffee-rails
-  config
+  config (>= 2.2.1)
   country_select
   daemons
   dalli
@@ -619,7 +619,7 @@ DEPENDENCIES
   omniauth-rails_csrf_protection
   omniauth-saml
   paper_trail
-  pg (~> 0.21.0)
+  pg (= 0.21.0)
   prawn
   prometheus_exporter
   protective

config/application.rb

@@ -60,7 +60,7 @@ class Application < Rails::Application
 
     memcached_host = ENV['RAILS_MEMCACHED_HOST'] || 'localhost'
     memcached_port = ENV['RAILS_MEMCACHED_PORT'] || '11211'
-    config.cache_store = :dalli_store, "#{memcached_host}:#{memcached_port}"
+    config.cache_store = :mem_cache_store, "#{memcached_host}:#{memcached_port}"
 
     config.middleware.insert_before Rack::ETag, Rack::Deflater
 

config/initializers/session_store.rb

@@ -1,27 +1,33 @@
 # Be sure to restart your server when you modify this file.
 
-def dalli_reachable?
-  Rails.cache.dalli.stats.values.any?
+def cache_reachable?
+  Rails.cache.stats.values.any?
 end
 
 def memcache_configured?
   if Rails.env.production?
     ENV['RAILS_MEMCACHED_HOST'].present?
-  elsif Rails.env.development?
-    true
   else
-    false
+    Rails.env.development?
   end
 end
 
+def skip_memcache_check
+  ENV['SKIP_MEMCACHE_CHECK'].present?
+end
+
 secure_cookies = !(Rails.env.development? || Rails.env.test?)
 
 Rails.application.config.session_store ActionDispatch::Session::CacheStore,
                                        expire_after: 12.hours,
                                        same_site: :lax,
                                        secure: secure_cookies
 
-# We expect memcache to work in production. Prevents an error with the rails console on OpenShift
-if memcache_configured? && !Rails.env.production? && !dalli_reachable?
+# We expect memcache to work in production.
+# Prevents an error with the rails console on OpenShift
+if !skip_memcache_check &&
+   memcache_configured? &&
+   !Rails.env.production? &&
+   !cache_reachable?
   fail "As CSRF tokens are read from cache, we require a memcache instance to start"
 end