diff --git a/Gemfile b/Gemfile index 2931215f5..2afbe55d6 100644 --- a/Gemfile +++ b/Gemfile @@ -81,6 +81,13 @@ gem "ransack", "~> 2.4" # Searching and sorting gem "recaptcha", "~> 5.6", 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.2.5" # Redis ruby client + +# NOTE: [@rhymes]: sign in doesn't work with the 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 transitive dependencies +# (added by redis-rails) 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 "redis-rails", "~> 5.0.2" # Redis for Ruby on Rails gem "request_store", "~> 1.5" # RequestStore gives you per-request global storage gem "reverse_markdown", "~> 2.0" # Map simple html back into markdown diff --git a/Gemfile.lock b/Gemfile.lock index 937ac4c88..fd99b3e34 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -228,7 +228,7 @@ GEM devise_invitable (2.0.3) actionmailer (>= 5.0) devise (>= 4.6) - diff-lcs (1.3) + diff-lcs (1.4.4) distribution (0.8.0) docile (1.3.3) dogstatsd-ruby (4.8.2) @@ -281,7 +281,7 @@ GEM feedjira (3.1.2) loofah (>= 2.3.1) sax-machine (>= 1.0) - ffi (1.13.1) + ffi (1.14.2) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake @@ -616,29 +616,29 @@ GEM rexml (3.2.4) rolify (5.3.0) rouge (3.26.0) - rspec (3.9.0) - rspec-core (~> 3.9.0) - rspec-expectations (~> 3.9.0) - rspec-mocks (~> 3.9.0) - rspec-core (3.9.2) - rspec-support (~> 3.9.3) - rspec-expectations (3.9.2) + rspec (3.10.0) + rspec-core (~> 3.10.0) + rspec-expectations (~> 3.10.0) + rspec-mocks (~> 3.10.0) + rspec-core (3.10.1) + rspec-support (~> 3.10.0) + rspec-expectations (3.10.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-mocks (3.9.1) + rspec-support (~> 3.10.0) + rspec-mocks (3.10.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-rails (4.0.1) + rspec-support (~> 3.10.0) + rspec-rails (4.0.2) actionpack (>= 4.2) activesupport (>= 4.2) railties (>= 4.2) - rspec-core (~> 3.9) - rspec-expectations (~> 3.9) - rspec-mocks (~> 3.9) - rspec-support (~> 3.9) + rspec-core (~> 3.10) + rspec-expectations (~> 3.10) + rspec-mocks (~> 3.10) + rspec-support (~> 3.10) rspec-retry (0.6.2) rspec-core (> 3.3) - rspec-support (3.9.3) + rspec-support (3.10.1) rubocop (1.7.0) parallel (~> 1.10) parser (>= 2.7.1.5) @@ -927,6 +927,8 @@ DEPENDENCIES recaptcha (~> 5.6) redcarpet (~> 3.5) redis (~> 4.2.5) + redis-actionpack (= 5.1.0) + redis-rack (= 2.0.6) redis-rails (~> 5.0.2) request_store (~> 1.5) reverse_markdown (~> 2.0) diff --git a/vendor/cache/diff-lcs-1.3.gem b/vendor/cache/diff-lcs-1.3.gem deleted file mode 100644 index ae5a5f92e..000000000 Binary files a/vendor/cache/diff-lcs-1.3.gem and /dev/null differ diff --git a/vendor/cache/diff-lcs-1.4.4.gem b/vendor/cache/diff-lcs-1.4.4.gem new file mode 100644 index 000000000..3be4edc12 Binary files /dev/null and b/vendor/cache/diff-lcs-1.4.4.gem differ diff --git a/vendor/cache/ffi-1.13.1.gem b/vendor/cache/ffi-1.13.1.gem deleted file mode 100644 index e59187ea1..000000000 Binary files a/vendor/cache/ffi-1.13.1.gem and /dev/null differ diff --git a/vendor/cache/ffi-1.14.2.gem b/vendor/cache/ffi-1.14.2.gem new file mode 100644 index 000000000..9586e5293 Binary files /dev/null and b/vendor/cache/ffi-1.14.2.gem differ diff --git a/vendor/cache/rspec-3.10.0.gem b/vendor/cache/rspec-3.10.0.gem new file mode 100644 index 000000000..8932c9c4b Binary files /dev/null and b/vendor/cache/rspec-3.10.0.gem differ diff --git a/vendor/cache/rspec-3.9.0.gem b/vendor/cache/rspec-3.9.0.gem deleted file mode 100644 index d0cdbe399..000000000 Binary files a/vendor/cache/rspec-3.9.0.gem and /dev/null differ diff --git a/vendor/cache/rspec-core-3.10.1.gem b/vendor/cache/rspec-core-3.10.1.gem new file mode 100644 index 000000000..7c8a2058f Binary files /dev/null and b/vendor/cache/rspec-core-3.10.1.gem differ diff --git a/vendor/cache/rspec-core-3.9.2.gem b/vendor/cache/rspec-core-3.9.2.gem deleted file mode 100644 index 539c863d9..000000000 Binary files a/vendor/cache/rspec-core-3.9.2.gem and /dev/null differ diff --git a/vendor/cache/rspec-expectations-3.10.1.gem b/vendor/cache/rspec-expectations-3.10.1.gem new file mode 100644 index 000000000..de1935a9c Binary files /dev/null and b/vendor/cache/rspec-expectations-3.10.1.gem differ diff --git a/vendor/cache/rspec-expectations-3.9.2.gem b/vendor/cache/rspec-expectations-3.9.2.gem deleted file mode 100644 index 6efb671f9..000000000 Binary files a/vendor/cache/rspec-expectations-3.9.2.gem and /dev/null differ diff --git a/vendor/cache/rspec-mocks-3.10.1.gem b/vendor/cache/rspec-mocks-3.10.1.gem new file mode 100644 index 000000000..b53323d65 Binary files /dev/null and b/vendor/cache/rspec-mocks-3.10.1.gem differ diff --git a/vendor/cache/rspec-mocks-3.9.1.gem b/vendor/cache/rspec-mocks-3.9.1.gem deleted file mode 100644 index bb4da3cad..000000000 Binary files a/vendor/cache/rspec-mocks-3.9.1.gem and /dev/null differ diff --git a/vendor/cache/rspec-rails-4.0.1.gem b/vendor/cache/rspec-rails-4.0.1.gem deleted file mode 100644 index 9d81093ba..000000000 Binary files a/vendor/cache/rspec-rails-4.0.1.gem and /dev/null differ diff --git a/vendor/cache/rspec-rails-4.0.2.gem b/vendor/cache/rspec-rails-4.0.2.gem new file mode 100644 index 000000000..d46dc080d Binary files /dev/null and b/vendor/cache/rspec-rails-4.0.2.gem differ diff --git a/vendor/cache/rspec-support-3.10.1.gem b/vendor/cache/rspec-support-3.10.1.gem new file mode 100644 index 000000000..4ba6d167b Binary files /dev/null and b/vendor/cache/rspec-support-3.10.1.gem differ diff --git a/vendor/cache/rspec-support-3.9.3.gem b/vendor/cache/rspec-support-3.9.3.gem deleted file mode 100644 index a644f2ab9..000000000 Binary files a/vendor/cache/rspec-support-3.9.3.gem and /dev/null differ