Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
1e3cea1a
Commit
1e3cea1a
authored
Jun 04, 2018
by
Kamil Trzciński
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bring back the EE changes to CE to authentication of builds
parent
3571b97e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
1 deletion
+7
-1
lib/gitlab/auth.rb
lib/gitlab/auth.rb
+7
-1
No files found.
lib/gitlab/auth.rb
View file @
1e3cea1a
...
@@ -240,7 +240,7 @@ module Gitlab
...
@@ -240,7 +240,7 @@ module Gitlab
return
unless
login
==
'gitlab-ci-token'
return
unless
login
==
'gitlab-ci-token'
return
unless
password
return
unless
password
build
=
::
Ci
::
Build
.
running
.
fin
d_by_token
(
password
)
build
=
find_buil
d_by_token
(
password
)
return
unless
build
return
unless
build
return
unless
build
.
project
.
builds_enabled?
return
unless
build
.
project
.
builds_enabled?
...
@@ -301,6 +301,12 @@ module Gitlab
...
@@ -301,6 +301,12 @@ module Gitlab
REGISTRY_SCOPES
REGISTRY_SCOPES
end
end
private
def
find_build_by_token
(
token
)
::
Ci
::
Build
.
running
.
find_by_token
(
token
)
end
end
end
end
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment