summaryrefslogtreecommitdiff
path: root/app/models/project.rb
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2015-07-02 13:29:50 +0300
committerValery Sizov <vsv2711@gmail.com>2015-07-02 13:29:50 +0300
commit7015ef1b60895ffa2a46b4a41f8f02018f74614c (patch)
tree401e3adc848ab6913e1f70e5f15a76d1133d86e9 /app/models/project.rb
parent52e0d4754f70dddbad19b59cda9483152abf0617 (diff)
downloadgitlab-ci-oauth_everywhere.tar.gz
Get rid of private message usageoauth_everywhere
Diffstat (limited to 'app/models/project.rb')
-rw-r--r--app/models/project.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index f103a88..4ec9495 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -84,7 +84,12 @@ ls -la
end
def from_gitlab(user, scope = :owned, options)
- opts = { private_token: user.private_token }
+ opts = if user.access_token
+ { access_token: user.access_token }
+ else
+ { private_token: user.private_token }
+ end
+
opts.merge! options
projects = Network.new.projects(opts.compact, scope)