diff --git a/Gemfile b/Gemfile index ee0ad0c55..95bd394bd 100644 --- a/Gemfile +++ b/Gemfile @@ -81,21 +81,17 @@ gem "rails", "~> 6.1.4" # Ruby on Rails gem "ransack", "~> 2.5" # Searching and sorting gem "recaptcha", "~> 5.8", require: "recaptcha/rails" # Helpers for the reCAPTCHA API gem "redcarpet", "~> 3.5" # A fast, safe and extensible Markdown to (X)HTML parser + gem "redis", "~> 4.5.1" # Redis ruby client +gem "redis-actionpack", "5.2.0" # Redis session store for ActionPack. Used for storing the Rails session in Redis. gem "rpush", "~> 6.0" # Push Notification library for Rails gem "rpush-redis", "~> 1.1" # Redis module capability for rpush library -gem "rss", "~> 0.2.9" # Ruby's standard library for RSS - -# NOTE: [@rhymes, @citizen428]: sign in doesn't work with redis-rack 2.1.0+ or with redis-actionpack 5.2.0+ -# We need to investigate why exactly, in the meantime we are hardcoding these two dependencies -# to keep them at the latest working version -gem "redis-actionpack", "5.1.0" # Redis session store for ActionPack. Used for storing the Rails session in Redis. -gem "redis-rack", "2.0.6" # Redis Store for Rack applications gem "request_store", "~> 1.5" # RequestStore gives you per-request global storage gem "reverse_markdown", "~> 2.1" # Map simple html back into markdown gem "rolify", "~> 6.0" # Very simple Roles library gem "rouge", "~> 3.27" # A pure-ruby code highlighter +gem "rss", "~> 0.2.9" # Ruby's standard library for RSS gem "rubyzip", "~> 2.3" # Rubyzip is a ruby library for reading and writing zip files gem "s3_direct_upload", "~> 0.1" # Direct Upload to Amazon S3 gem "sidekiq", "~> 6.3.1" # Sidekiq is used to process background jobs with the help of Redis diff --git a/Gemfile.lock b/Gemfile.lock index a1a0480a6..2855a7f6c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -627,12 +627,12 @@ GEM json redcarpet (3.5.1) redis (4.5.1) - redis-actionpack (5.1.0) - actionpack (>= 4.0, < 7) - redis-rack (>= 1, < 3) + redis-actionpack (5.2.0) + actionpack (>= 5, < 7) + redis-rack (>= 2.1.0, < 3) redis-store (>= 1.1.0, < 2) - redis-rack (2.0.6) - rack (>= 1.5, < 3) + redis-rack (2.1.3) + rack (>= 2.0.8, < 3) redis-store (>= 1.2, < 2) redis-store (1.9.0) redis (>= 4, < 5) @@ -998,8 +998,7 @@ DEPENDENCIES recaptcha (~> 5.8) redcarpet (~> 3.5) redis (~> 4.5.1) - redis-actionpack (= 5.1.0) - redis-rack (= 2.0.6) + redis-actionpack (= 5.2.0) request_store (~> 1.5) reverse_markdown (~> 2.1) rolify (~> 6.0) diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index 886935e71..cbc0722f8 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -17,7 +17,6 @@ Rails.application.config.session_store :redis_store, domain: domain, servers: servers, expire_after: expires_after, - signed: true, secure: ApplicationConfig["FORCE_SSL_IN_RAILS"] == "true", same_site: :lax, httponly: true diff --git a/vendor/cache/redis-actionpack-5.1.0.gem b/vendor/cache/redis-actionpack-5.1.0.gem deleted file mode 100644 index ad92523b5..000000000 Binary files a/vendor/cache/redis-actionpack-5.1.0.gem and /dev/null differ diff --git a/vendor/cache/redis-actionpack-5.2.0.gem b/vendor/cache/redis-actionpack-5.2.0.gem new file mode 100644 index 000000000..ae04f89ac Binary files /dev/null and b/vendor/cache/redis-actionpack-5.2.0.gem differ diff --git a/vendor/cache/redis-rack-2.0.6.gem b/vendor/cache/redis-rack-2.0.6.gem deleted file mode 100644 index f5e4c5c6c..000000000 Binary files a/vendor/cache/redis-rack-2.0.6.gem and /dev/null differ diff --git a/vendor/cache/redis-rack-2.1.3.gem b/vendor/cache/redis-rack-2.1.3.gem new file mode 100644 index 000000000..d56ef0f3c Binary files /dev/null and b/vendor/cache/redis-rack-2.1.3.gem differ