diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-02-23 09:44:37 -0600 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-02-23 09:44:37 -0600 |
| commit | ade5e0b1ba04047c72cb0aff3d635a2cdaaab43c (patch) | |
| tree | 8830af3d47518f62930585e4f92bbee814519506 | |
| parent | f88ff0cc0c5c1db7089a5f0062a53d38eb27ebde (diff) | |
| download | gitlab-ce-dm-meer-blauw-op-straat.tar.gz | |
Fix new offensesdm-meer-blauw-op-straat
| -rw-r--r-- | app/controllers/projects/pipelines_controller.rb | 8 | ||||
| -rw-r--r-- | lib/api/v3/notes.rb | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb index e436c6666c3..8657bc4dfdc 100644 --- a/app/controllers/projects/pipelines_controller.rb +++ b/app/controllers/projects/pipelines_controller.rb @@ -13,16 +13,16 @@ class Projects::PipelinesController < Projects::ApplicationController .page(params[:page]) .per(30) - @running_count = PipelinesFinder. + @running_count = PipelinesFinder .new(project).execute(scope: 'running').count - @pending_count = PipelinesFinder. + @pending_count = PipelinesFinder .new(project).execute(scope: 'pending').count - @finished_count = PipelinesFinder. + @finished_count = PipelinesFinder .new(project).execute(scope: 'finished').count - @pipelines_count = PipelinesFinder. + @pipelines_count = PipelinesFinder .new(project).execute.count respond_to do |format| diff --git a/lib/api/v3/notes.rb b/lib/api/v3/notes.rb index 6531598d590..0796bb62e68 100644 --- a/lib/api/v3/notes.rb +++ b/lib/api/v3/notes.rb @@ -5,7 +5,7 @@ module API before { authenticate! } - NOTEABLE_TYPES = [Issue, MergeRequest, Snippet] + NOTEABLE_TYPES = [Issue, MergeRequest, Snippet].freeze params do requires :id, type: String, desc: 'The ID of a project' @@ -85,7 +85,7 @@ module API note = ::Notes::CreateService.new(user_project, current_user, opts).execute if note.valid? - present note, with: ::API::V3::Entities::const_get(note.class.name) + present note, with: ::API::V3::Entities.const_get(note.class.name) else not_found!("Note #{note.errors.messages}") end |