diff options
author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2019-02-28 13:52:25 -0300 |
---|---|---|
committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2019-03-06 10:53:55 -0300 |
commit | 959ad992b6b95458f084569ec6d71c8608c3e3c7 (patch) | |
tree | 0ffb4495b0778afc3fa5191fd940b52f643e1bcb /app/services/merge_requests | |
parent | 81a0cc251bb5dc6e66b03b8bb224f2779e15a851 (diff) | |
download | gitlab-ce-959ad992b6b95458f084569ec6d71c8608c3e3c7.tar.gz |
Ref merge does not fail upon FF config enabled
Diffstat (limited to 'app/services/merge_requests')
-rw-r--r-- | app/services/merge_requests/merge_to_ref_service.rb | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/app/services/merge_requests/merge_to_ref_service.rb b/app/services/merge_requests/merge_to_ref_service.rb index 586652ae44e..d62d9cba3f6 100644 --- a/app/services/merge_requests/merge_to_ref_service.rb +++ b/app/services/merge_requests/merge_to_ref_service.rb @@ -20,7 +20,7 @@ module MergeRequests raise_error('Conflicts detected during merge') unless commit_id - success(commit_id: commit_id) + success(commit_id: commit_id, source_id: source) rescue MergeError => error error(error.message) end @@ -38,12 +38,8 @@ module MergeRequests error = if Feature.disabled?(:merge_to_tmp_merge_ref_path, project) 'Feature is not enabled' - elsif !merge_method_supported? - "#{project.human_merge_method} to #{target_ref} is currently not supported." elsif !hooks_validation_pass?(merge_request) hooks_validation_error(merge_request) - elsif @merge_request.should_be_rebased? - 'Fast-forward merge is not possible. Please update your source branch.' elsif !@merge_request.mergeable_to_ref? "Merge request is not mergeable to #{target_ref}" elsif !source @@ -68,9 +64,5 @@ module MergeRequests rescue Gitlab::Git::PreReceiveError => error raise MergeError, error.message end - - def merge_method_supported? - [:merge, :rebase_merge].include?(project.merge_method) - end end end |