diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2019-03-29 14:56:40 +0700 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2019-04-01 14:02:57 +0700 |
| commit | a7d4824ded0c5ae6a155d7bdc87a1ba71eb3df5c (patch) | |
| tree | 855a0cd3c16093fb76f38738876da23da6b2ccc1 /app/services/merge_requests | |
| parent | 093629fedc43e8b481c6626765e3fcf0603add17 (diff) | |
| download | gitlab-ce-a7d4824ded0c5ae6a155d7bdc87a1ba71eb3df5c.tar.gz | |
Check mergeability in merge to ref servicecheck-mergeability-in-merge-to-ref-service
and add spec
Add changelog
ok
ok
Diffstat (limited to 'app/services/merge_requests')
| -rw-r--r-- | app/services/merge_requests/merge_to_ref_service.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/services/merge_requests/merge_to_ref_service.rb b/app/services/merge_requests/merge_to_ref_service.rb index 69cc441f1bb..87147d90c32 100644 --- a/app/services/merge_requests/merge_to_ref_service.rb +++ b/app/services/merge_requests/merge_to_ref_service.rb @@ -41,9 +41,7 @@ module MergeRequests super error = - if Feature.disabled?(:merge_to_tmp_merge_ref_path, project) - 'Feature is not enabled' - elsif !hooks_validation_pass?(merge_request) + if !hooks_validation_pass?(merge_request) hooks_validation_error(merge_request) elsif !@merge_request.mergeable_to_ref? "Merge request is not mergeable to #{target_ref}" |