aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2015-12-17 14:30:21 +0100
committerDavid Heinemeier Hansson <david@loudthinking.com>2015-12-17 14:30:21 +0100
commitb708a6050c640217e3431ff5de73fad91576705b (patch)
tree8a1217911cdade854e5eb0e25296ed8e84f9db92 /activesupport
parent748b21db8ff850378b20a69ccd4215c06abea03e (diff)
downloadrails-b708a6050c640217e3431ff5de73fad91576705b.tar.gz
rails-b708a6050c640217e3431ff5de73fad91576705b.tar.bz2
rails-b708a6050c640217e3431ff5de73fad91576705b.zip
Use consistent references
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/CHANGELOG.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 386ef821a7..70d671cd2d 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -19,7 +19,7 @@
private
def set_current
Current.account = Account.find(params[:account_id])
- Current.person = Current.account.people.find(params[:person_id])
+ Current.user = Current.account.users.find(params[:user_id])
end
end
@@ -40,8 +40,8 @@
end
class Event < ApplicationRecord
- belongs_to :creator, class_name: 'Person'
- before_validation { self.creator ||= Current.person }
+ belongs_to :creator, class_name: 'User'
+ before_validation { self.creator ||= Current.user }
end
*DHH*