diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-19 18:06:24 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-19 18:06:24 +0300 |
| commit | 88542a5e9613c8442a982e65ad5cf13eb33bc541 (patch) | |
| tree | 11a65d86e623b443b8a2976cc93cff360e2da8a2 /app/services/merge_requests | |
| parent | b570d73ecd31e2ca9cf8c2f1adb056edf2869477 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/merge_requests')
| -rw-r--r-- | app/services/merge_requests/merge_service.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/services/merge_requests/merge_service.rb b/app/services/merge_requests/merge_service.rb index a45b4f1142e..2eef3eed804 100644 --- a/app/services/merge_requests/merge_service.rb +++ b/app/services/merge_requests/merge_service.rb @@ -62,8 +62,6 @@ module MergeRequests end def updated_check! - return unless Feature.enabled?(:validate_merge_sha, merge_request.target_project, default_enabled: false) - unless source_matches? raise_error('Branch has been updated since the merge was requested. '\ 'Please review the changes.') |