diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2014-12-19 16:15:29 +0200 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2014-12-24 15:38:07 +0200 |
| commit | e41dadcb33fda44ee274daa673bd933e13aa90eb (patch) | |
| tree | ef0dc6ecea0020fe1ce8598342bcbf7e620984fe /lib/api/helpers.rb | |
| parent | 5cf2bd4c997d84e9a02d722d6ba870c24b06cc0f (diff) | |
| download | gitlab-ce-e41dadcb33fda44ee274daa673bd933e13aa90eb.tar.gz | |
Doorkeeper integration
Diffstat (limited to 'lib/api/helpers.rb')
| -rw-r--r-- | lib/api/helpers.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb index 027fb20ec46..2f2342840fd 100644 --- a/lib/api/helpers.rb +++ b/lib/api/helpers.rb @@ -11,7 +11,7 @@ module API def current_user private_token = (params[PRIVATE_TOKEN_PARAM] || env[PRIVATE_TOKEN_HEADER]).to_s - @current_user ||= User.find_by(authentication_token: private_token) + @current_user ||= (User.find_by(authentication_token: private_token) || doorkeeper_guard) unless @current_user && Gitlab::UserAccess.allowed?(@current_user) return nil |