diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-02 12:06:58 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-02 12:06:58 +0300 |
| commit | 259c0cc0c4f8a49001b33d1bee577f4422e16d62 (patch) | |
| tree | b2cb5854de1e32daf6f94d55a7b6e5805f020eec /app/controllers/projects/branches_controller.rb | |
| parent | 01de60f3a8f4d99e641d04d31369628425137c21 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/branches_controller.rb')
| -rw-r--r-- | app/controllers/projects/branches_controller.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb index 578a3d451a7..a908da08f57 100644 --- a/app/controllers/projects/branches_controller.rb +++ b/app/controllers/projects/branches_controller.rb @@ -133,8 +133,6 @@ class Projects::BranchesController < Projects::ApplicationController # frontend could omit this set. To prevent excessive I/O, we require # that a list of names be specified. def limit_diverging_commit_counts! - return unless Feature.enabled?(:limit_diverging_commit_counts, default_enabled: true) - limit = Kaminari.config.default_per_page # If we don't have many branches in the repository, then go ahead. |