diff options
| author | Phil Hughes <me@iamphill.com> | 2016-11-02 12:15:25 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-11-21 21:01:45 -0500 |
| commit | ba2089e01711eb3f97770235b86ae9e59862ee8b (patch) | |
| tree | 6a9bfe8608127dd4ef63fff87834d75106ccce3d /app/controllers | |
| parent | af02f6ae9d500b0174cae106891b626d1dcae351 (diff) | |
| download | gitlab-ce-ba2089e01711eb3f97770235b86ae9e59862ee8b.tar.gz | |
Uses take rather than Kaminari
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index fe0670aa246..6affadfa0a6 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -270,12 +270,12 @@ class ProjectsController < Projects::ApplicationController branches = BranchesFinder.new(@repository, params).execute options = { - 'Branches' => Kaminari.paginate_array(branches).page(params[:page]).per(100), + 'Branches' => branches.take(100), } unless @repository.tag_count.zero? tags = TagsFinder.new(@repository, params).execute - options['Tags'] = Kaminari.paginate_array(tags).page(params[:page]).per(100) + options['Tags'] = tags.take(100) end # If reference is commit id - we should add it to branch/tag selectbox |