Merge branch 'rs-fix-ee-compat' into 'master'

Fix invalid object reference in ee_compat_check script See merge request !11455

Merge branch 'rs-fix-ee-compat' into 'master'
fb31c6ce · Douwe Maan · 258f578f · 611c2fb0 · fb31c6ce
Commit fb31c6ce authored May 17, 2017 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

ee_compat_check.rb lib/gitlab/ee_compat_check.rb +1 -1

No files found.
--- 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}]