diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-07-04 12:31:07 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-07-04 12:31:07 +0300 |
| commit | 03f0f2566b3c536cf512b287e0d4d52d40a065c5 (patch) | |
| tree | fd28c5029e51fa7240060a1a029903cc63ab3cc6 /app/controllers/projects | |
| parent | d81ce8b25c50d96f47d6cdbcdfc3d1f66fca0f96 (diff) | |
| parent | 04b046587fe609cd889f3fa518f08299abc61267 (diff) | |
Merge branch 'bvl-graphql-pipeline-lists' into 'master'
Add pipeline lists to graphql
Closes #48469
See merge request gitlab-org/gitlab-ce!20249
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/pipelines_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb index 768595ceeb4..45cef123c34 100644 --- a/app/controllers/projects/pipelines_controller.rb +++ b/app/controllers/projects/pipelines_controller.rb @@ -13,7 +13,7 @@ class Projects::PipelinesController < Projects::ApplicationController def index @scope = params[:scope] @pipelines = PipelinesFinder - .new(project, scope: @scope) + .new(project, current_user, scope: @scope) .execute .page(params[:page]) .per(30) @@ -178,7 +178,7 @@ class Projects::PipelinesController < Projects::ApplicationController end def limited_pipelines_count(project, scope = nil) - finder = PipelinesFinder.new(project, scope: scope) + finder = PipelinesFinder.new(project, current_user, scope: scope) view_context.limited_counter_with_delimiter(finder.execute) end |