diff --git a/Gemfile b/Gemfile index 32cf27003..66bcf2a78 100644 --- a/Gemfile +++ b/Gemfile @@ -77,7 +77,7 @@ gem "pundit", "~> 2.2" # Object oriented authorization for Rails applications gem "rack-attack", "~> 6.6.1" # Used to throttle requests to prevent brute force attacks gem "rack-cors", "~> 1.1" # Middleware that will make Rack-based apps CORS compatible gem "rack-timeout", "~> 0.6" # Rack middleware which aborts requests that have been running for longer than a specified timeout -gem "rails", "~> 7.0.4.1" # Ruby on Rails +gem "rails", "~> 7.0.5.1" # Ruby on Rails gem "ransack", "~> 3.2" # Searching and sorting gem "recaptcha", "~> 5.10", 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 7e465da70..5da45ae24 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,69 +9,69 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (7.0.4.3) - actionpack (= 7.0.4.3) - activesupport (= 7.0.4.3) + actioncable (7.0.5.1) + actionpack (= 7.0.5.1) + activesupport (= 7.0.5.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.4.3) - actionpack (= 7.0.4.3) - activejob (= 7.0.4.3) - activerecord (= 7.0.4.3) - activestorage (= 7.0.4.3) - activesupport (= 7.0.4.3) + actionmailbox (7.0.5.1) + actionpack (= 7.0.5.1) + activejob (= 7.0.5.1) + activerecord (= 7.0.5.1) + activestorage (= 7.0.5.1) + activesupport (= 7.0.5.1) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.4.3) - actionpack (= 7.0.4.3) - actionview (= 7.0.4.3) - activejob (= 7.0.4.3) - activesupport (= 7.0.4.3) + actionmailer (7.0.5.1) + actionpack (= 7.0.5.1) + actionview (= 7.0.5.1) + activejob (= 7.0.5.1) + activesupport (= 7.0.5.1) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.4.3) - actionview (= 7.0.4.3) - activesupport (= 7.0.4.3) - rack (~> 2.0, >= 2.2.0) + actionpack (7.0.5.1) + actionview (= 7.0.5.1) + activesupport (= 7.0.5.1) + rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.4.3) - actionpack (= 7.0.4.3) - activerecord (= 7.0.4.3) - activestorage (= 7.0.4.3) - activesupport (= 7.0.4.3) + actiontext (7.0.5.1) + actionpack (= 7.0.5.1) + activerecord (= 7.0.5.1) + activestorage (= 7.0.5.1) + activesupport (= 7.0.5.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.4.3) - activesupport (= 7.0.4.3) + actionview (7.0.5.1) + activesupport (= 7.0.5.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) active_record_union (1.3.0) activerecord (>= 4.0) - activejob (7.0.4.3) - activesupport (= 7.0.4.3) + activejob (7.0.5.1) + activesupport (= 7.0.5.1) globalid (>= 0.3.6) - activemodel (7.0.4.3) - activesupport (= 7.0.4.3) - activerecord (7.0.4.3) - activemodel (= 7.0.4.3) - activesupport (= 7.0.4.3) - activestorage (7.0.4.3) - actionpack (= 7.0.4.3) - activejob (= 7.0.4.3) - activerecord (= 7.0.4.3) - activesupport (= 7.0.4.3) + activemodel (7.0.5.1) + activesupport (= 7.0.5.1) + activerecord (7.0.5.1) + activemodel (= 7.0.5.1) + activesupport (= 7.0.5.1) + activestorage (7.0.5.1) + actionpack (= 7.0.5.1) + activejob (= 7.0.5.1) + activerecord (= 7.0.5.1) + activesupport (= 7.0.5.1) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.4.3) + activesupport (7.0.5.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -522,7 +522,7 @@ GEM connection_pool (~> 2.2) net-http2 (0.18.4) http-2 (~> 0.11) - net-imap (0.3.4) + net-imap (0.3.6) date net-protocol net-pop (0.1.2) @@ -627,20 +627,20 @@ GEM rack-test (2.1.0) rack (>= 1.3) rack-timeout (0.6.3) - rails (7.0.4.3) - actioncable (= 7.0.4.3) - actionmailbox (= 7.0.4.3) - actionmailer (= 7.0.4.3) - actionpack (= 7.0.4.3) - actiontext (= 7.0.4.3) - actionview (= 7.0.4.3) - activejob (= 7.0.4.3) - activemodel (= 7.0.4.3) - activerecord (= 7.0.4.3) - activestorage (= 7.0.4.3) - activesupport (= 7.0.4.3) + rails (7.0.5.1) + actioncable (= 7.0.5.1) + actionmailbox (= 7.0.5.1) + actionmailer (= 7.0.5.1) + actionpack (= 7.0.5.1) + actiontext (= 7.0.5.1) + actionview (= 7.0.5.1) + activejob (= 7.0.5.1) + activemodel (= 7.0.5.1) + activerecord (= 7.0.5.1) + activestorage (= 7.0.5.1) + activesupport (= 7.0.5.1) bundler (>= 1.15.0) - railties (= 7.0.4.3) + railties (= 7.0.5.1) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) @@ -650,9 +650,9 @@ GEM rails-i18n (7.0.5) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (7.0.4.3) - actionpack (= 7.0.4.3) - activesupport (= 7.0.4.3) + railties (7.0.5.1) + actionpack (= 7.0.5.1) + activesupport (= 7.0.5.1) method_source rake (>= 12.2) thor (~> 1.0) @@ -888,7 +888,7 @@ GEM thread_safe (0.3.6) tilt (2.2.0) timecop (0.9.6) - timeout (0.3.2) + timeout (0.4.0) twitter (7.0.0) addressable (~> 2.3) buftok (~> 0.2.0) @@ -1059,7 +1059,7 @@ DEPENDENCIES rack-cors (~> 1.1) rack-host-redirect (~> 1.3) rack-timeout (~> 0.6) - rails (~> 7.0.4.1) + rails (~> 7.0.5.1) ransack (~> 3.2) recaptcha (~> 5.10) redcarpet (~> 3.5) diff --git a/app/models/article.rb b/app/models/article.rb index 46595c28a..421ef47cd 100644 --- a/app/models/article.rb +++ b/app/models/article.rb @@ -123,7 +123,7 @@ class Article < ApplicationRecord has_many :mentions, as: :mentionable, inverse_of: :mentionable, dependent: :delete_all has_many :comments, as: :commentable, inverse_of: :commentable, dependent: :nullify has_many :context_notifications, as: :context, inverse_of: :context, dependent: :delete_all - has_many :context_notifications_published, -> { where(context_notifications: { action: "Published" }) }, + has_many :context_notifications_published, -> { where(context_notifications_published: { action: "Published" }) }, as: :context, inverse_of: :context, class_name: "ContextNotification" has_many :notification_subscriptions, as: :notifiable, inverse_of: :notifiable, dependent: :delete_all has_many :notifications, as: :notifiable, inverse_of: :notifiable, dependent: :delete_all diff --git a/vendor/cache/actioncable-7.0.4.3.gem b/vendor/cache/actioncable-7.0.4.3.gem deleted file mode 100644 index f10b3c784..000000000 Binary files a/vendor/cache/actioncable-7.0.4.3.gem and /dev/null differ diff --git a/vendor/cache/actioncable-7.0.5.1.gem b/vendor/cache/actioncable-7.0.5.1.gem new file mode 100644 index 000000000..368570323 Binary files /dev/null and b/vendor/cache/actioncable-7.0.5.1.gem differ diff --git a/vendor/cache/actionmailbox-7.0.4.3.gem b/vendor/cache/actionmailbox-7.0.4.3.gem deleted file mode 100644 index fb5c3c7c9..000000000 Binary files a/vendor/cache/actionmailbox-7.0.4.3.gem and /dev/null differ diff --git a/vendor/cache/actionmailbox-7.0.5.1.gem b/vendor/cache/actionmailbox-7.0.5.1.gem new file mode 100644 index 000000000..38b7360f1 Binary files /dev/null and b/vendor/cache/actionmailbox-7.0.5.1.gem differ diff --git a/vendor/cache/actionmailer-7.0.4.3.gem b/vendor/cache/actionmailer-7.0.4.3.gem deleted file mode 100644 index 930530a79..000000000 Binary files a/vendor/cache/actionmailer-7.0.4.3.gem and /dev/null differ diff --git a/vendor/cache/actionmailer-7.0.5.1.gem b/vendor/cache/actionmailer-7.0.5.1.gem new file mode 100644 index 000000000..6d07a03bd Binary files /dev/null and b/vendor/cache/actionmailer-7.0.5.1.gem differ diff --git a/vendor/cache/actionpack-7.0.4.3.gem b/vendor/cache/actionpack-7.0.4.3.gem deleted file mode 100644 index 2e9987e04..000000000 Binary files a/vendor/cache/actionpack-7.0.4.3.gem and /dev/null differ diff --git a/vendor/cache/actionpack-7.0.5.1.gem b/vendor/cache/actionpack-7.0.5.1.gem new file mode 100644 index 000000000..2c1f6a657 Binary files /dev/null and b/vendor/cache/actionpack-7.0.5.1.gem differ diff --git a/vendor/cache/actiontext-7.0.4.3.gem b/vendor/cache/actiontext-7.0.4.3.gem deleted file mode 100644 index ffce464bc..000000000 Binary files a/vendor/cache/actiontext-7.0.4.3.gem and /dev/null differ diff --git a/vendor/cache/actiontext-7.0.5.1.gem b/vendor/cache/actiontext-7.0.5.1.gem new file mode 100644 index 000000000..b27fd10a7 Binary files /dev/null and b/vendor/cache/actiontext-7.0.5.1.gem differ diff --git a/vendor/cache/actionview-7.0.4.3.gem b/vendor/cache/actionview-7.0.4.3.gem deleted file mode 100644 index 400f69d5a..000000000 Binary files a/vendor/cache/actionview-7.0.4.3.gem and /dev/null differ diff --git a/vendor/cache/actionview-7.0.5.1.gem b/vendor/cache/actionview-7.0.5.1.gem new file mode 100644 index 000000000..8b8e587f4 Binary files /dev/null and b/vendor/cache/actionview-7.0.5.1.gem differ diff --git a/vendor/cache/activejob-7.0.4.3.gem b/vendor/cache/activejob-7.0.4.3.gem deleted file mode 100644 index ad011be0e..000000000 Binary files a/vendor/cache/activejob-7.0.4.3.gem and /dev/null differ diff --git a/vendor/cache/activejob-7.0.5.1.gem b/vendor/cache/activejob-7.0.5.1.gem new file mode 100644 index 000000000..1ef0ea753 Binary files /dev/null and b/vendor/cache/activejob-7.0.5.1.gem differ diff --git a/vendor/cache/activemodel-7.0.4.3.gem b/vendor/cache/activemodel-7.0.4.3.gem deleted file mode 100644 index 42baf1c0a..000000000 Binary files a/vendor/cache/activemodel-7.0.4.3.gem and /dev/null differ diff --git a/vendor/cache/activemodel-7.0.5.1.gem b/vendor/cache/activemodel-7.0.5.1.gem new file mode 100644 index 000000000..cd58a34de Binary files /dev/null and b/vendor/cache/activemodel-7.0.5.1.gem differ diff --git a/vendor/cache/activerecord-7.0.4.3.gem b/vendor/cache/activerecord-7.0.4.3.gem deleted file mode 100644 index b632c5d46..000000000 Binary files a/vendor/cache/activerecord-7.0.4.3.gem and /dev/null differ diff --git a/vendor/cache/activerecord-7.0.5.1.gem b/vendor/cache/activerecord-7.0.5.1.gem new file mode 100644 index 000000000..b23bbc23c Binary files /dev/null and b/vendor/cache/activerecord-7.0.5.1.gem differ diff --git a/vendor/cache/activestorage-7.0.4.3.gem b/vendor/cache/activestorage-7.0.4.3.gem deleted file mode 100644 index c67428d02..000000000 Binary files a/vendor/cache/activestorage-7.0.4.3.gem and /dev/null differ diff --git a/vendor/cache/activestorage-7.0.5.1.gem b/vendor/cache/activestorage-7.0.5.1.gem new file mode 100644 index 000000000..ad890bdee Binary files /dev/null and b/vendor/cache/activestorage-7.0.5.1.gem differ diff --git a/vendor/cache/activesupport-7.0.4.3.gem b/vendor/cache/activesupport-7.0.4.3.gem deleted file mode 100644 index b0230f45e..000000000 Binary files a/vendor/cache/activesupport-7.0.4.3.gem and /dev/null differ diff --git a/vendor/cache/activesupport-7.0.5.1.gem b/vendor/cache/activesupport-7.0.5.1.gem new file mode 100644 index 000000000..464013a0a Binary files /dev/null and b/vendor/cache/activesupport-7.0.5.1.gem differ diff --git a/vendor/cache/net-imap-0.3.4.gem b/vendor/cache/net-imap-0.3.4.gem deleted file mode 100644 index b129422e0..000000000 Binary files a/vendor/cache/net-imap-0.3.4.gem and /dev/null differ diff --git a/vendor/cache/net-imap-0.3.6.gem b/vendor/cache/net-imap-0.3.6.gem new file mode 100644 index 000000000..a96d4573f Binary files /dev/null and b/vendor/cache/net-imap-0.3.6.gem differ diff --git a/vendor/cache/rails-7.0.4.3.gem b/vendor/cache/rails-7.0.4.3.gem deleted file mode 100644 index d41b33c95..000000000 Binary files a/vendor/cache/rails-7.0.4.3.gem and /dev/null differ diff --git a/vendor/cache/rails-7.0.5.1.gem b/vendor/cache/rails-7.0.5.1.gem new file mode 100644 index 000000000..1b6813f88 Binary files /dev/null and b/vendor/cache/rails-7.0.5.1.gem differ diff --git a/vendor/cache/railties-7.0.4.3.gem b/vendor/cache/railties-7.0.4.3.gem deleted file mode 100644 index 97fd8b129..000000000 Binary files a/vendor/cache/railties-7.0.4.3.gem and /dev/null differ diff --git a/vendor/cache/railties-7.0.5.1.gem b/vendor/cache/railties-7.0.5.1.gem new file mode 100644 index 000000000..70b208357 Binary files /dev/null and b/vendor/cache/railties-7.0.5.1.gem differ diff --git a/vendor/cache/timeout-0.3.2.gem b/vendor/cache/timeout-0.3.2.gem deleted file mode 100644 index 201947fda..000000000 Binary files a/vendor/cache/timeout-0.3.2.gem and /dev/null differ diff --git a/vendor/cache/timeout-0.4.0.gem b/vendor/cache/timeout-0.4.0.gem new file mode 100644 index 000000000..3253fb5e1 Binary files /dev/null and b/vendor/cache/timeout-0.4.0.gem differ