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
6e31e1b8
Commit
6e31e1b8
authored
Sep 08, 2017
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve app/services/ci/create_pipeline_service.rb
parent
168cb81c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
11 deletions
+0
-11
app/services/ci/create_pipeline_service.rb
app/services/ci/create_pipeline_service.rb
+0
-11
No files found.
app/services/ci/create_pipeline_service.rb
View file @
6e31e1b8
...
...
@@ -16,11 +16,7 @@ module Ci
protected:
project
.
protected_for?
(
ref
)
)
<<<<<<<
HEAD
result
=
validate_project_and_git_items
(
mirror_update:
mirror_update
)
||
=======
result
=
validate_project_and_git_items
||
>>>>>>>
upstream
/
master
validate_pipeline
(
ignore_skip_ci:
ignore_skip_ci
,
save_on_errors:
save_on_errors
)
...
...
@@ -51,22 +47,15 @@ module Ci
private
<<<<<<<
HEAD
def
validate_project_and_git_items
(
mirror_update:
false
)
=======
def
validate_project_and_git_items
>>>>>>>
upstream
/
master
unless
project
.
builds_enabled?
return
error
(
'Pipeline is disabled'
)
end
<<<<<<<
HEAD
if
mirror_update
&&
!
project
.
mirror_trigger_builds?
return
error
(
'Pipeline is disabled for mirror updates'
)
end
=======
>>>>>>>
upstream
/
master
unless
allowed_to_trigger_pipeline?
if
can?
(
current_user
,
:create_pipeline
,
project
)
return
error
(
"Insufficient permissions for protected ref '
#{
ref
}
'"
)
...
...
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