diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2014-12-29 09:30:55 +0100 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2014-12-29 09:30:55 +0100 |
| commit | 42fb42aed4cc30d101e81fa5934d9f1b9521dfce (patch) | |
| tree | 2efa529fe83f7d06d815bd153ae1ea9f8e1f4b7a /lib/api/helpers.rb | |
| parent | 1c089a8561556377dccbf661a3016cac2329c713 (diff) | |
| parent | 6cf501004b54c1b311ea7c6c364cfb4a88c1060b (diff) | |
| download | gitlab-ce-42fb42aed4cc30d101e81fa5934d9f1b9521dfce.tar.gz | |
Merge branch 'master' into developer_can_push_to_protected_branches_option
Conflicts:
db/schema.rb
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 |