diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-02-22 22:49:31 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-02-22 22:49:31 +0000 |
| commit | 972b77f7a67f6a84ab18b49abf2e4b9195181bdd (patch) | |
| tree | 55cd91649e5b68370011ca8d11fe9a682f15d563 /lib | |
| parent | d9d12c74f3d8d9322d5116f920bc00a92b73fad4 (diff) | |
| parent | 23e43ec5b18b35e6fe92adcbf3ca3d9a51a210b9 (diff) | |
| download | gitlab-ce-972b77f7a67f6a84ab18b49abf2e4b9195181bdd.tar.gz | |
Merge branch 'improve-ee_compat_check-by-using-git-apply-3way-flag' into 'master'
Improve `Gitlab::EeCompatCheck` by using the `git apply --3way` flag
See merge request !9447
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ee_compat_check.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/ee_compat_check.rb b/lib/gitlab/ee_compat_check.rb index c8e36d8ff4a..e0fdf3f3d64 100644 --- a/lib/gitlab/ee_compat_check.rb +++ b/lib/gitlab/ee_compat_check.rb @@ -119,7 +119,7 @@ module Gitlab step("Reseting to latest master", %w[git reset --hard origin/master]) step("Checking if #{patch_path} applies cleanly to EE/master") - output, status = Gitlab::Popen.popen(%W[git apply --check #{patch_path}]) + output, status = Gitlab::Popen.popen(%W[git apply --check --3way #{patch_path}]) unless status.zero? failed_files = output.lines.reduce([]) do |memo, line| |