diff --git a/Gemfile b/Gemfile index d46a8d0d66b82..e6e300b59e7ca 100644 --- a/Gemfile +++ b/Gemfile @@ -14,7 +14,7 @@ gem "active_record_union", "~> 1.3" # Adds proper union and union_all methods to gem "acts-as-taggable-on", "~> 7.0" # A tagging plugin for Rails applications that allows for custom tagging along dynamic contexts gem "acts_as_follower", github: "forem/acts_as_follower", branch: "master" # Allow any model to follow any other model gem "addressable", "~> 2.7" # A replacement for the URI implementation that is part of Ruby's standard library -gem "ahoy_email", "~> 1.1" # Email analytics for Rails +gem "ahoy_email", "~> 2.1" # Email analytics for Rails gem "ahoy_matey", "~> 3.2" # Tracking analytics for Rails gem "ancestry", "~> 3.2" # Ancestry allows the records of a ActiveRecord model to be organized in a tree structure gem "blazer", "~> 2.4.2" # Allows admins to query data diff --git a/Gemfile.lock b/Gemfile.lock index 40848d16f4b35..20ea727e35a96 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -96,7 +96,7 @@ GEM activerecord (>= 5.0, < 6.2) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) - ahoy_email (1.1.0) + ahoy_email (2.1.0) actionmailer (>= 5) addressable (>= 2.3.2) nokogiri @@ -193,7 +193,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.8) + concurrent-ruby (1.1.9) connection_pool (2.2.3) counter_culture (2.8.0) activerecord (>= 4.2) @@ -325,8 +325,8 @@ GEM gibbon (3.4.0) faraday (>= 0.16.0) multi_json (>= 1.11.0) - globalid (0.4.2) - activesupport (>= 4.2.0) + globalid (0.5.2) + activesupport (>= 5.0) guard (2.16.2) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) @@ -429,7 +429,7 @@ GEM listen (3.5.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.9.0) + loofah (2.12.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.2.8) @@ -447,8 +447,8 @@ GEM mimemagic (0.3.5) mini_histogram (0.3.1) mini_magick (4.11.0) - mini_mime (1.0.2) - mini_portile2 (2.5.0) + mini_mime (1.1.1) + mini_portile2 (2.5.3) minitest (5.14.4) modis (3.3.0) activemodel (>= 4.2) @@ -581,7 +581,7 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.3.0) + rails-html-sanitizer (1.4.2) loofah (~> 2.3) rails-settings-cached (2.5.2) rails (>= 5.0.0) @@ -866,7 +866,7 @@ DEPENDENCIES acts-as-taggable-on (~> 7.0) acts_as_follower! addressable (~> 2.7) - ahoy_email (~> 1.1) + ahoy_email (~> 2.1) ahoy_matey (~> 3.2) amazing_print (~> 1.3) ancestry (~> 3.2) diff --git a/vendor/cache/ahoy_email-1.1.0.gem b/vendor/cache/ahoy_email-1.1.0.gem deleted file mode 100644 index d0a499592e339..0000000000000 Binary files a/vendor/cache/ahoy_email-1.1.0.gem and /dev/null differ diff --git a/vendor/cache/ahoy_email-2.1.0.gem b/vendor/cache/ahoy_email-2.1.0.gem new file mode 100644 index 0000000000000..7a5c4692575f7 Binary files /dev/null and b/vendor/cache/ahoy_email-2.1.0.gem differ diff --git a/vendor/cache/concurrent-ruby-1.1.8.gem b/vendor/cache/concurrent-ruby-1.1.8.gem deleted file mode 100644 index 40b30f3f5fa88..0000000000000 Binary files a/vendor/cache/concurrent-ruby-1.1.8.gem and /dev/null differ diff --git a/vendor/cache/concurrent-ruby-1.1.9.gem b/vendor/cache/concurrent-ruby-1.1.9.gem new file mode 100644 index 0000000000000..9ed64f26c74f4 Binary files /dev/null and b/vendor/cache/concurrent-ruby-1.1.9.gem differ diff --git a/vendor/cache/globalid-0.4.2.gem b/vendor/cache/globalid-0.4.2.gem deleted file mode 100644 index 8dcf8e3132b8b..0000000000000 Binary files a/vendor/cache/globalid-0.4.2.gem and /dev/null differ diff --git a/vendor/cache/globalid-0.5.2.gem b/vendor/cache/globalid-0.5.2.gem new file mode 100644 index 0000000000000..a9d2fb00b91c6 Binary files /dev/null and b/vendor/cache/globalid-0.5.2.gem differ diff --git a/vendor/cache/loofah-2.12.0.gem b/vendor/cache/loofah-2.12.0.gem new file mode 100644 index 0000000000000..edf8cf6b08235 Binary files /dev/null and b/vendor/cache/loofah-2.12.0.gem differ diff --git a/vendor/cache/loofah-2.9.0.gem b/vendor/cache/loofah-2.9.0.gem deleted file mode 100644 index ca1d43599b3f3..0000000000000 Binary files a/vendor/cache/loofah-2.9.0.gem and /dev/null differ diff --git a/vendor/cache/mini_mime-1.0.2.gem b/vendor/cache/mini_mime-1.0.2.gem deleted file mode 100644 index 974ef106c10f1..0000000000000 Binary files a/vendor/cache/mini_mime-1.0.2.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/mini_portile2-2.5.0.gem b/vendor/cache/mini_portile2-2.5.0.gem deleted file mode 100644 index cd8b4aa0f954e..0000000000000 Binary files a/vendor/cache/mini_portile2-2.5.0.gem and /dev/null differ diff --git a/vendor/cache/mini_portile2-2.5.3.gem b/vendor/cache/mini_portile2-2.5.3.gem new file mode 100644 index 0000000000000..996c1febb3546 Binary files /dev/null and b/vendor/cache/mini_portile2-2.5.3.gem differ diff --git a/vendor/cache/rails-html-sanitizer-1.3.0.gem b/vendor/cache/rails-html-sanitizer-1.3.0.gem deleted file mode 100644 index bd8e8aad5bafa..0000000000000 Binary files a/vendor/cache/rails-html-sanitizer-1.3.0.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