diff --git a/Gemfile b/Gemfile index 39853eaeebaea..f84969961862a 100644 --- a/Gemfile +++ b/Gemfile @@ -75,7 +75,7 @@ gem "rack-cors", "~> 1.1" # Middleware that will make Rack-based apps CORS compa gem "rack-timeout", "~> 0.6" # Rack middleware which aborts requests that have been running for longer than a specified timeout gem "rails", "~> 6.1.4" # Ruby on Rails # Pinned since we have a monkey-patch against this version -gem "rails-settings-cached", "2.6.0" # Settings plugin for Rails that makes managing a table of global key, value pairs easy. +gem "rails-settings-cached", "2.8.1" # Settings plugin for Rails that makes managing a table of global key, value pairs easy. gem "ransack", "~> 2.4" # 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 diff --git a/Gemfile.lock b/Gemfile.lock index 56a94a1d86a2e..8da0416c02389 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -420,7 +420,7 @@ GEM lumberjack (1.2.8) mail (2.7.1) mini_mime (>= 0.1.1) - marcel (1.0.1) + marcel (1.0.2) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) memory_profiler (1.0.0) @@ -430,7 +430,7 @@ GEM mime-types-data (3.2021.0704) mini_histogram (0.3.1) mini_magick (4.11.0) - mini_mime (1.1.0) + mini_mime (1.1.1) mini_portile2 (2.6.1) minitest (5.14.4) modis (4.0.0) @@ -562,9 +562,9 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.1) + rails-html-sanitizer (1.4.2) loofah (~> 2.3) - rails-settings-cached (2.6.0) + rails-settings-cached (2.8.1) rails (>= 5.0.0) railties (6.1.4.1) actionpack (= 6.1.4.1) @@ -941,7 +941,7 @@ DEPENDENCIES rack-host-redirect (~> 1.3) rack-timeout (~> 0.6) rails (~> 6.1.4) - rails-settings-cached (= 2.6.0) + rails-settings-cached (= 2.8.1) ransack (~> 2.4) recaptcha (~> 5.8) redcarpet (~> 3.5) diff --git a/vendor/cache/marcel-1.0.1.gem b/vendor/cache/marcel-1.0.1.gem deleted file mode 100644 index 0ad605c80a14a..0000000000000 Binary files a/vendor/cache/marcel-1.0.1.gem and /dev/null differ diff --git a/vendor/cache/marcel-1.0.2.gem b/vendor/cache/marcel-1.0.2.gem new file mode 100644 index 0000000000000..acb69eb32f847 Binary files /dev/null and b/vendor/cache/marcel-1.0.2.gem differ diff --git a/vendor/cache/mini_mime-1.1.0.gem b/vendor/cache/mini_mime-1.1.0.gem deleted file mode 100644 index 26d0f62927e35..0000000000000 Binary files a/vendor/cache/mini_mime-1.1.0.gem and /dev/null differ diff --git a/vendor/cache/mini_mime-1.1.1.gem b/vendor/cache/mini_mime-1.1.1.gem new file mode 100644 index 0000000000000..ba2a8652a5aa7 Binary files /dev/null and b/vendor/cache/mini_mime-1.1.1.gem differ diff --git a/vendor/cache/rails-html-sanitizer-1.4.1.gem b/vendor/cache/rails-html-sanitizer-1.4.1.gem deleted file mode 100644 index 9ff67a624c16d..0000000000000 Binary files a/vendor/cache/rails-html-sanitizer-1.4.1.gem and /dev/null differ diff --git a/vendor/cache/rails-html-sanitizer-1.4.2.gem b/vendor/cache/rails-html-sanitizer-1.4.2.gem new file mode 100644 index 0000000000000..aab9fa6cfb716 Binary files /dev/null and b/vendor/cache/rails-html-sanitizer-1.4.2.gem differ diff --git a/vendor/cache/rails-settings-cached-2.6.0.gem b/vendor/cache/rails-settings-cached-2.6.0.gem deleted file mode 100644 index c5d6eb45a7fc4..0000000000000 Binary files a/vendor/cache/rails-settings-cached-2.6.0.gem and /dev/null differ diff --git a/vendor/cache/rails-settings-cached-2.8.1.gem b/vendor/cache/rails-settings-cached-2.8.1.gem new file mode 100644 index 0000000000000..38eb2e6f37506 Binary files /dev/null and b/vendor/cache/rails-settings-cached-2.8.1.gem differ