diff options
| author | Jan Provaznik <jprovaznik@gitlab.com> | 2019-07-03 10:59:32 +0000 |
|---|---|---|
| committer | Jan Provaznik <jprovaznik@gitlab.com> | 2019-07-03 10:59:32 +0000 |
| commit | 792af55fd455a4b1eb3f63d582925c40ab2b141d (patch) | |
| tree | fc95200618b738734c3379c35f597385d1b747c6 /app/helpers | |
| parent | f7d19f8b624de265761f28af4e3bd86641a86759 (diff) | |
| parent | 2ceffce190165321a1818801e245456870c4708a (diff) | |
| download | gitlab-ce-792af55fd455a4b1eb3f63d582925c40ab2b141d.tar.gz | |
Merge branch 'jc-deprecate-diverging-count-with-max' into 'master'
Deprecate diverging commit count with max parameter
Closes gitaly#1702
See merge request gitlab-org/gitlab-ce!30275
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/branches_helper.rb | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/app/helpers/branches_helper.rb b/app/helpers/branches_helper.rb index eadf48205fc..c759882d7f8 100644 --- a/app/helpers/branches_helper.rb +++ b/app/helpers/branches_helper.rb @@ -8,12 +8,4 @@ module BranchesHelper def protected_branch?(project, branch) ProtectedBranch.protected?(project, branch.name) end - - def diverging_count_label(count) - if count >= Repository::MAX_DIVERGING_COUNT - "#{Repository::MAX_DIVERGING_COUNT - 1}+" - else - count.to_s - end - end end |