diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-17 21:09:55 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-05-17 21:09:55 +0000 |
| commit | fb31c6cedf532e9594ff3d42050f01be0cfc8d57 (patch) | |
| tree | 6b17d0afed4906d395d528616b11f4bada228a5a | |
| parent | 258f578fc8d58b3e343664ca59ab0df0d14057f0 (diff) | |
| parent | 611c2fb0bc1dea8ff8e47b8a62354ca9a1c002d7 (diff) | |
| download | gitlab-ce-fb31c6cedf532e9594ff3d42050f01be0cfc8d57.tar.gz | |
Merge branch 'rs-fix-ee-compat' into 'master'
Fix invalid object reference in ee_compat_check script
See merge request !11455
| -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 198896220ac..38e27513281 100644 --- a/lib/gitlab/ee_compat_check.rb +++ b/lib/gitlab/ee_compat_check.rb @@ -131,7 +131,7 @@ module Gitlab def check_patch(patch_path) step("Checking out master", %w[git checkout master]) step("Resetting to latest master", %w[git reset --hard origin/master]) - step("Fetching CE/#{branch}", %W[git fetch #{CE_REPO} #{branch}]) + step("Fetching CE/#{ce_branch}", %W[git fetch #{CE_REPO} #{ce_branch}]) step( "Checking if #{patch_path} applies cleanly to EE/master", %W[git apply --check --3way #{patch_path}] |