summaryrefslogtreecommitdiff
path: root/lib/gitlab/ee_compat_check.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-03-27 14:34:56 +0200
committerRémy Coutable <remy@rymai.me>2017-03-28 09:26:47 +0200
commit1dbd80d190425120b4fcff48b390121c5a91e902 (patch)
tree26b66c0d659c48e677b6deeb502ad0e3052f6eca /lib/gitlab/ee_compat_check.rb
parentd4c99f644a2da2aa340aee8bc10c1dcf7c9e0d18 (diff)
downloadgitlab-ce-1dbd80d190425120b4fcff48b390121c5a91e902.tar.gz
Fix Gitlab::EeCompatCheck: use `ee_branch_found` instead of `ee_branch`
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'lib/gitlab/ee_compat_check.rb')
-rw-r--r--lib/gitlab/ee_compat_check.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/ee_compat_check.rb b/lib/gitlab/ee_compat_check.rb
index 0829c1c318e..496ee0bdcb0 100644
--- 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