summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-04-24 16:31:32 +0000
committerRémy Coutable <remy@rymai.me>2017-04-24 16:31:32 +0000
commitdf65e4376e2455ec39890a58f3428a98c2317516 (patch)
treeb5b51b1795e3f9aca31895762a1e3af99034440b /lib
parent3855751d024d20a05343141c65aa3b588645dcfa (diff)
parentbee780e8fdf56fa24b54326e9c27f0b1ab7446f7 (diff)
downloadgitlab-ce-df65e4376e2455ec39890a58f3428a98c2317516.tar.gz
Merge branch '30305-oauth-token-push-code' into 'master'
Allow OAuth clients to push code Closes #30305 See merge request !10677
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/auth.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb
index eee5601b0ed..ea918b23a63 100644
--- a/lib/gitlab/auth.rb
+++ b/lib/gitlab/auth.rb
@@ -108,7 +108,7 @@ module Gitlab
token = Doorkeeper::AccessToken.by_token(password)
if valid_oauth_token?(token)
user = User.find_by(id: token.resource_owner_id)
- Gitlab::Auth::Result.new(user, nil, :oauth, read_authentication_abilities)
+ Gitlab::Auth::Result.new(user, nil, :oauth, full_authentication_abilities)
end
end
end