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
88196399
Commit
88196399
authored
May 06, 2019
by
Shinya Maeda
Committed by
Lin Jen-Shin
Jun 12, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove merge request pipeline check in mergeable method
parent
2efbe19b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
71 deletions
+5
-71
ee/app/models/ee/merge_request.rb
ee/app/models/ee/merge_request.rb
+0
-13
ee/changelogs/unreleased/remove-merge-request-pipeline-checkes.yml
...logs/unreleased/remove-merge-request-pipeline-checkes.yml
+5
-0
ee/spec/models/merge_request_spec.rb
ee/spec/models/merge_request_spec.rb
+0
-58
No files found.
ee/app/models/ee/merge_request.rb
View file @
88196399
...
@@ -71,13 +71,6 @@ module EE
...
@@ -71,13 +71,6 @@ module EE
end
end
end
end
override
:mergeable_ci_state?
def
mergeable_ci_state?
return
false
unless
validate_merge_request_pipelines
super
end
def
get_on_train!
(
user
)
def
get_on_train!
(
user
)
create_merge_train!
(
user:
user
,
target_project:
target_project
,
target_branch:
target_branch
)
create_merge_train!
(
user:
user
,
target_project:
target_project
,
target_branch:
target_branch
)
end
end
...
@@ -99,12 +92,6 @@ module EE
...
@@ -99,12 +92,6 @@ module EE
false
false
end
end
def
validate_merge_request_pipelines
return
true
unless
project
.
merge_pipelines_enabled?
actual_head_pipeline
&
.
latest_merge_request_pipeline?
end
def
validate_approval_rule_source
def
validate_approval_rule_source
return
unless
approval_rules
.
any?
return
unless
approval_rules
.
any?
...
...
ee/changelogs/unreleased/remove-merge-request-pipeline-checkes.yml
0 → 100644
View file @
88196399
---
title
:
Allow merge requests to be merged even when it does not have up-to-date pipeline when merge request pipeline is enabled
merge_request
:
12309
author
:
type
:
changed
ee/spec/models/merge_request_spec.rb
View file @
88196399
...
@@ -622,64 +622,6 @@ describe MergeRequest do
...
@@ -622,64 +622,6 @@ describe MergeRequest do
end
end
end
end
describe
'#mergeable_ci_state?'
do
subject
{
merge_request
.
mergeable_ci_state?
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:merge_request
)
do
create
(
:merge_request
,
:with_merge_request_pipeline
,
source_branch:
'feature'
,
source_project:
project
,
target_branch:
'master'
,
target_project:
project
)
end
shared_examples_for
'merge pipelines project option is disabled'
do
before
do
project
.
merge_pipelines_enabled
=
false
end
it
{
is_expected
.
to
be_truthy
}
end
before
do
stub_licensed_features
(
merge_pipelines:
true
)
project
.
merge_pipelines_enabled
=
true
merge_request
.
update_head_pipeline
end
it
{
is_expected
.
to
be_truthy
}
context
'when head pipeline is a detached merge request pipeline'
do
before
do
merge_request
.
head_pipeline
.
update_column
(
:target_sha
,
nil
)
end
it
{
is_expected
.
to
be_falsy
}
it_behaves_like
'merge pipelines project option is disabled'
end
context
'when source sha of the merge request pipeline is not HEAD'
do
before
do
merge_request
.
head_pipeline
.
update_column
(
:source_sha
,
'old-commit'
)
end
it
{
is_expected
.
to
be_falsy
}
it_behaves_like
'merge pipelines project option is disabled'
end
context
'when target sha of the merge request pipeline is not HEAD'
do
before
do
merge_request
.
head_pipeline
.
update_column
(
:target_sha
,
'old-commit'
)
end
it
{
is_expected
.
to
be_falsy
}
it_behaves_like
'merge pipelines project option is disabled'
end
end
describe
'#get_on_train!'
do
describe
'#get_on_train!'
do
subject
{
merge_request
.
get_on_train!
(
user
)
}
subject
{
merge_request
.
get_on_train!
(
user
)
}
...
...
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