diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-10 21:08:04 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-10 21:08:04 +0300 |
| commit | 115c8ea7af7ef69ca3f09c333314546e9b5712f9 (patch) | |
| tree | c3b6798c11e502f7d2785649f95d2255beac3c91 /lib/api | |
| parent | 27d91a629918e417a9e87825e838209b9ace79c1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/api_guard.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/api/api_guard.rb b/lib/api/api_guard.rb index 02ea321df67..d1535c43808 100644 --- a/lib/api/api_guard.rb +++ b/lib/api/api_guard.rb @@ -63,7 +63,9 @@ module API end def find_user_from_sources - find_user_from_access_token || find_user_from_warden + find_user_from_access_token || + find_user_from_job_token || + find_user_from_warden end private |