From b708a6050c640217e3431ff5de73fad91576705b Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Thu, 17 Dec 2015 14:30:21 +0100
Subject: Use consistent references

---
 activesupport/CHANGELOG.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'activesupport')

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*
-- 
cgit v1.2.3