Merge branch 'fix-ee_compat_check' into 'master'

Fix Gitlab::EeCompatCheck: use `ee_branch_found` instead of `ee_branch` Closes #30136 See merge request !10255

Merge branch 'fix-ee_compat_check' into 'master'
ad831ace · Sean McGivern · 19a44034 · 1dbd80d1 · ad831ace
Commit ad831ace authored Mar 28, 2017 by Sean McGivern
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

No files found.
--- a/lib/gitlab/ee_compat_check.rb
+++ b/lib/gitlab/ee_compat_check.rb
@@ -125,7 +125,7 @@ module Gitlab
      end

      puts
-      puts applies_cleanly_msg(ee_branch)
+      puts applies_cleanly_msg(ee_branch_found)
    end

    def check_patch(patch_path)
@@ -215,7 +215,7 @@ module Gitlab
    end

    def ee_patch_name
-      @ee_patch_name ||= patch_name_from_branch(ee_branch)
+      @ee_patch_name ||= patch_name_from_branch(ee_branch_found)
    end

    def ee_patch_full_path