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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
c9c715cd
Commit
c9c715cd
authored
Jul 20, 2017
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make permission checks easier to understand
parent
a05bc477
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
app/services/ci/create_pipeline_service.rb
app/services/ci/create_pipeline_service.rb
+6
-6
No files found.
app/services/ci/create_pipeline_service.rb
View file @
c9c715cd
...
@@ -23,16 +23,16 @@ module Ci
...
@@ -23,16 +23,16 @@ module Ci
unless
allowed_to_trigger_pipeline?
(
triggering_user
)
unless
allowed_to_trigger_pipeline?
(
triggering_user
)
if
can?
(
triggering_user
,
:create_pipeline
,
project
)
if
can?
(
triggering_user
,
:create_pipeline
,
project
)
if
branch?
||
tag?
return
error
(
"Insufficient permissions for protected ref '
#{
ref
}
'"
)
return
error
(
"Insufficient permissions for protected ref '
#{
ref
}
'"
)
else
return
error
(
'Reference not found'
)
end
else
else
return
error
(
'Insufficient permissions to create a new pipeline'
)
return
error
(
'Insufficient permissions to create a new pipeline'
)
end
end
end
end
unless
branch?
||
tag?
return
error
(
'Reference not found'
)
end
unless
commit
unless
commit
return
error
(
'Commit not found'
)
return
error
(
'Commit not found'
)
end
end
...
@@ -93,7 +93,7 @@ module Ci
...
@@ -93,7 +93,7 @@ module Ci
elsif
tag?
elsif
tag?
access
.
can_create_tag?
(
ref
)
access
.
can_create_tag?
(
ref
)
else
else
fals
e
true
# Allow it for now and we'll reject when we check ref existenc
e
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