diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-03-17 10:09:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-17 10:09:55 +0100 |
| commit | 43eff898a0b0f31aaf042d9d387aaece2627a01d (patch) | |
| tree | 2cfb9f959ffb96d6c964f8249e14dac6d50a39f5 /app | |
| parent | 9cb6bc56faab374c1c740c7093d5271d37201aed (diff) | |
Prepare Mastodon for Rails 6 (#15911)
* Fix misuse of foreign_type * Fix use of removed "add_template_helper" * Use response.media_type instead of response.content_type in tests * Fix CSV export controller test on Rails 6 Rails 6 sets a "filename*" field in the Content-Disposition header to explicitly encode the filename as UTF-8. This changes checks the first part of the Content-Disposition header so it matches in both Rails 5 and Rails 6. * Fix emoji formatting with Rails 6 * Make emoji output more idiomatic and robust * Switch from redis-rails gem to built-in Rails redis cache storage
Diffstat (limited to 'app')
| -rw-r--r-- | app/lib/formatter.rb | 4 | ||||
| -rw-r--r-- | app/mailers/notification_mailer.rb | 2 | ||||
| -rw-r--r-- | app/mailers/user_mailer.rb | 2 | ||||
| -rw-r--r-- | app/models/notification.rb | 12 |
4 files changed, 10 insertions, 10 deletions
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb index 7252234d6..6fb5d5419 100644 --- a/app/lib/formatter.rb +++ b/app/lib/formatter.rb @@ -158,9 +158,9 @@ class Formatter original_url, static_url = emoji replacement = begin if animate - "<img draggable=\"false\" class=\"emojione\" alt=\":#{encode(shortcode)}:\" title=\":#{encode(shortcode)}:\" src=\"#{encode(original_url)}\" />" + image_tag(original_url, draggable: false, class: 'emojione', alt: ":#{shortcode}:", title: ":#{shortcode}:") else - "<img draggable=\"false\" class=\"emojione custom-emoji\" alt=\":#{encode(shortcode)}:\" title=\":#{encode(shortcode)}:\" src=\"#{encode(static_url)}\" data-original=\"#{original_url}\" data-static=\"#{static_url}\" />" + image_tag(original_url, draggable: false, class: 'emojione custom-emoji', alt: ":#{shortcode}:", title: ":#{shortcode}:", data: { original: original_url, static: static_url }) end end before_html = shortname_start_index.positive? ? html[0..shortname_start_index - 1] : '' diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb index 54db892cc..9e683b6a1 100644 --- a/app/mailers/notification_mailer.rb +++ b/app/mailers/notification_mailer.rb @@ -4,7 +4,7 @@ class NotificationMailer < ApplicationMailer helper :accounts helper :statuses - add_template_helper RoutingHelper + helper RoutingHelper def mention(recipient, notification) @me = recipient diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb index 95996ba3f..68d1c4507 100644 --- a/app/mailers/user_mailer.rb +++ b/app/mailers/user_mailer.rb @@ -8,7 +8,7 @@ class UserMailer < Devise::Mailer helper :instance helper :statuses - add_template_helper RoutingHelper + helper RoutingHelper def confirmation_instructions(user, token, **) @resource = user diff --git a/app/models/notification.rb b/app/models/notification.rb index 98a6a618f..3bf9dd483 100644 --- a/app/models/notification.rb +++ b/app/models/notification.rb @@ -49,12 +49,12 @@ class Notification < ApplicationRecord belongs_to :from_account, class_name: 'Account', optional: true belongs_to :activity, polymorphic: true, optional: true - belongs_to :mention, foreign_type: 'Mention', foreign_key: 'activity_id', optional: true - belongs_to :status, foreign_type: 'Status', foreign_key: 'activity_id', optional: true - belongs_to :follow, foreign_type: 'Follow', foreign_key: 'activity_id', optional: true - belongs_to :follow_request, foreign_type: 'FollowRequest', foreign_key: 'activity_id', optional: true - belongs_to :favourite, foreign_type: 'Favourite', foreign_key: 'activity_id', optional: true - belongs_to :poll, foreign_type: 'Poll', foreign_key: 'activity_id', optional: true + belongs_to :mention, foreign_key: 'activity_id', optional: true + belongs_to :status, foreign_key: 'activity_id', optional: true + belongs_to :follow, foreign_key: 'activity_id', optional: true + belongs_to :follow_request, foreign_key: 'activity_id', optional: true + belongs_to :favourite, foreign_key: 'activity_id', optional: true + belongs_to :poll, foreign_key: 'activity_id', optional: true validates :type, inclusion: { in: TYPES } |