diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-11-06 15:43:24 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-11-06 15:43:24 +0000 |
| commit | 1208d55206128266690f46f0165df0fc10c24941 (patch) | |
| tree | 93fbdde5a5db6cdd8f79f2806707dab093985aa2 /app/controllers/projects/commit_controller.rb | |
| parent | d171ff60168cd55b6d7b9ee920269f44a26e577e (diff) | |
| parent | d0c58a97c8a053c0beec7c13c1c6ec5042120ef1 (diff) | |
| download | gitlab-ce-refactor-snippets-finder.tar.gz | |
Merge branch 'master' into 'refactor-snippets-finder'refactor-snippets-finder
# Conflicts:
# spec/models/project_spec.rb
Diffstat (limited to 'app/controllers/projects/commit_controller.rb')
| -rw-r--r-- | app/controllers/projects/commit_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb index 00b63f55710..32fc5140366 100644 --- a/app/controllers/projects/commit_controller.rb +++ b/app/controllers/projects/commit_controller.rb @@ -43,7 +43,7 @@ class Projects::CommitController < Projects::ApplicationController # rubocop: disable CodeReuse/ActiveRecord def pipelines @pipelines = @commit.pipelines.order(id: :desc) - @pipelines = @pipelines.where(ref: params[:ref]) if params[:ref] + @pipelines = @pipelines.where(ref: params[:ref]).page(params[:page]).per(30) if params[:ref] respond_to do |format| format.html @@ -53,6 +53,7 @@ class Projects::CommitController < Projects::ApplicationController render json: { pipelines: PipelineSerializer .new(project: @project, current_user: @current_user) + .with_pagination(request, response) .represent(@pipelines), count: { all: @pipelines.count |