Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Update Rails to version 5.1.1 (#3121)

Browse source 
* Update rails to version 5.1.1

* Run `rails app:update`

* Remove the override of polymorphic activity relationship

* Silence warning about otp_secret attribute being unknown to rails

* We will only introduce form_with where we want to use remote data
This commit is contained in:
Matt Jankowski 2017-06-01 14:53:37 -04:00 • committed by Eugen Rochko
parent e1fdac3e9a
commit 2212dc4aaa
7 changed files with 51 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/models/notification.rb
View file

@ -48,10 +48,6 @@ class Notification < ApplicationRecord
cache_associated :from_account, status: STATUS_INCLUDES, mention: [status: STATUS_INCLUDES], favourite: [:account, status: STATUS_INCLUDES], follow: :account
def activity(eager_loaded = true)
eager_loaded ? send(activity_type.underscore) : super()
end
def type
@type ||= TYPE_CLASS_MAP.invert[activity_type].to_sym
end
@ -96,9 +92,9 @@ class Notification < ApplicationRecord
case activity_type
when 'Status', 'Follow', 'Favourite', 'FollowRequest'
self.from_account_id = activity(false)&.account_id
self.from_account_id = activity&.account_id
when 'Mention'
self.from_account_id = activity(false)&.status&.account_id
self.from_account_id = activity&.status&.account_id
end
end
end

5
app/models/user.rb
View file

@ -58,6 +58,11 @@ class User < ApplicationRecord
before_validation :sanitize_languages
# This avoids a deprecation warning from Rails 5.1
# It seems possible that a future release of devise-two-factor will
# handle this itself, and this can be removed from our User class.
attribute :otp_secret
def confirmed?
confirmed_at.present?
end