diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-10-12 13:24:14 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-10-12 13:24:14 +0300 |
| commit | 1e4b75ba40570a3e96e1999e375a120c4ba8b346 (patch) | |
| tree | 1e1600e92f12fc853a51457dfbebcc70c97a0019 /app | |
| parent | 5d4e07330526e0cb2965ef5c218542094d1e1008 (diff) | |
| parent | 025c6eeaa1e02dce31cb836c39ee4a5f312f202f (diff) | |
Merge branch 'dm-api-authentication' into 'master'
Move all API authentication code to APIGuard
See merge request gitlab-org/gitlab-ce!14528
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/oauth_access_token.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/oauth_access_token.rb b/app/models/oauth_access_token.rb index b85f5dbaf2e..f89e60ad9f4 100644 --- a/app/models/oauth_access_token.rb +++ b/app/models/oauth_access_token.rb @@ -1,4 +1,6 @@ class OauthAccessToken < Doorkeeper::AccessToken belongs_to :resource_owner, class_name: 'User' belongs_to :application, class_name: 'Doorkeeper::Application' + + alias_method :user, :resource_owner end |