diff options
| author | Tiago Botelho <tiagonbotelho@hotmail.com> | 2016-12-20 18:52:09 +0000 |
|---|---|---|
| committer | Tiago Botelho <tiagonbotelho@hotmail.com> | 2016-12-21 23:53:24 +0000 |
| commit | 805bbe889328bff55b49290294721405148cc980 (patch) | |
| tree | 0beb7c9621db87d5f11928ca8231af8b1de21a6c /app/controllers/projects/issues_controller.rb | |
| parent | 9b66aa6e04ab66af7ce11e26076ebf431ca938c5 (diff) | |
| download | gitlab-ce-805bbe889328bff55b49290294721405148cc980.tar.gz | |
adds specs for respective behaviour
Diffstat (limited to 'app/controllers/projects/issues_controller.rb')
| -rw-r--r-- | app/controllers/projects/issues_controller.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index ec09a5297fc..0efeec98570 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -5,7 +5,6 @@ class Projects::IssuesController < Projects::ApplicationController include ToggleAwardEmoji include IssuableCollections include SpammableActions - include KaminariPagination before_action :redirect_to_external_issue_tracker, only: [:index, :new] before_action :module_enabled @@ -25,7 +24,10 @@ class Projects::IssuesController < Projects::ApplicationController def index @issues = issues_collection - @issues = bounded_pagination(@issues, params[:page]) + @issues = @issues.page(params[:page]) + if @issues.out_of_range? && @issues.total_pages != 0 + return redirect_to namespace_project_issues_path(page: @issues.total_pages) + end if params[:label_name].present? @labels = LabelsFinder.new(current_user, project_id: @project.id, title: params[:label_name]).execute |