diff options
Diffstat (limited to 'app/controllers/projects/commit_controller.rb')
| -rw-r--r-- | app/controllers/projects/commit_controller.rb | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb index b13c0ae3967..59a0f43622c 100644 --- a/app/controllers/projects/commit_controller.rb +++ b/app/controllers/projects/commit_controller.rb @@ -56,8 +56,8 @@ class Projects::CommitController < Projects::ApplicationController .with_pagination(request, response) .represent(@pipelines), count: { - all: @pipelines.count - } + all: @pipelines.count, + }, } end end @@ -65,9 +65,9 @@ class Projects::CommitController < Projects::ApplicationController # rubocop: enable CodeReuse/ActiveRecord def merge_requests - @merge_requests = @commit.merge_requests.map do |mr| - { iid: mr.iid, path: merge_request_path(mr), title: mr.title } - end + @merge_requests = @commit.merge_requests.map { |mr| + {iid: mr.iid, path: merge_request_path(mr), title: mr.title} + } respond_to do |format| format.json do @@ -141,7 +141,7 @@ class Projects::CommitController < Projects::ApplicationController return git_not_found! unless commit opts = diff_options - opts[:ignore_whitespace_change] = true if params[:format] == 'diff' + opts[:ignore_whitespace_change] = true if params[:format] == "diff" @diffs = commit.diffs(opts) @notes_count = commit.notes.count @@ -155,8 +155,8 @@ class Projects::CommitController < Projects::ApplicationController @note = @project.build_commit_note(commit) @new_diff_note_attrs = { - noteable_type: 'Commit', - commit_id: @commit.id + noteable_type: "Commit", + commit_id: @commit.id, } @grouped_diff_discussions = commit.grouped_diff_discussions @@ -166,10 +166,8 @@ class Projects::CommitController < Projects::ApplicationController @merge_request = MergeRequestsFinder.new(current_user, project_id: @project.id).find_by(iid: merge_request_iid) if @merge_request - @new_diff_note_attrs.merge!( - noteable_type: 'MergeRequest', - noteable_id: @merge_request.id - ) + @new_diff_note_attrs[:noteable_type] = "MergeRequest" + @new_diff_note_attrs[:noteable_id] = @merge_request.id merge_request_commit_notes = @merge_request.notes.where(commit_id: @commit.id).inc_relations_for_view merge_request_commit_diff_discussions = merge_request_commit_notes.grouped_diff_discussions(@commit.diff_refs) @@ -186,6 +184,6 @@ class Projects::CommitController < Projects::ApplicationController def assign_change_commit_vars @start_branch = params[:start_branch] - @commit_params = { commit: @commit } + @commit_params = {commit: @commit} end end |