diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-01-23 16:13:10 -0600 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-03-21 13:35:33 +0100 |
| commit | 007d353b8d689101797695b26d0781d365607e52 (patch) | |
| tree | ece94ecabc157a162931313568f552ab1edbf616 | |
| parent | c759133a78969fd6d87118bf864e82b714375e87 (diff) | |
| download | gitlab-ce-rs-dev-compat-check.tar.gz | |
Rename find_merge_base_with_masterrs-dev-compat-check
It's not always "with master" anymore.
| -rw-r--r-- | lib/gitlab/ee_compat_check.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/gitlab/ee_compat_check.rb b/lib/gitlab/ee_compat_check.rb index 28a33f7e813..b84a9e4589a 100644 --- a/lib/gitlab/ee_compat_check.rb +++ b/lib/gitlab/ee_compat_check.rb @@ -125,7 +125,7 @@ module Gitlab def generate_patch(patch_path, source:, target:) FileUtils.rm(patch_path, force: true) - find_merge_base_with_master(source: source, target: target) + find_merge_base(source: source, target: target) step( "Generating the patch against #{target} in #{patch_path}", @@ -238,8 +238,7 @@ module Gitlab end end - # TODO (rspeicher): Not always master - def find_merge_base_with_master(source:, target:) + def find_merge_base(source:, target:) # Start with (Math.exp(3).to_i = 20) until (Math.exp(6).to_i = 403) # In total we go (20 + 54 + 148 + 403 = 625) commits deeper depth = 20 |