Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into 'master'

Resolve "Use consistent style for trailing commas" Closes #27144 See merge request !11063

Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into 'master'
Resolve "Use consistent style for trailing commas" Closes #27144 See merge request !11063
cb2f739d · Robert Speicher · 000045e6 · 3db37e05 · cb2f739d · cb2f739d
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -494,7 +494,13 @@ Style/TrailingBlankLines:

 # This cop checks for trailing comma in array and hash literals.
 Style/TrailingCommaInLiteral:
-  Enabled: false
+  Enabled: true
+  EnforcedStyleForMultiline: no_comma
+
+# This cop checks for trailing comma in argument lists.
+Style/TrailingCommaInArguments:
+  Enabled: true
+  EnforcedStyleForMultiline: no_comma

 # Checks for %W when interpolation is not needed.
 Style/UnneededCapitalW:

--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -369,13 +369,6 @@ Style/SymbolProc:
 Style/TernaryParentheses:
  Enabled: false

-# Offense count: 53
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleForMultiline, SupportedStylesForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
-Style/TrailingCommaInArguments:
-  Enabled: false
-
 # Offense count: 18
 # Cop supports --auto-correct.
 # Configuration parameters: AllowNamedUnderscoreVariables.

--- a/app/controllers/autocomplete_controller.rb
+++ b/app/controllers/autocomplete_controller.rb
@@ -41,7 +41,7 @@ def projects

    no_project = {
      id: 0,
-      name_with_namespace: 'No project',
+      name_with_namespace: 'No project'
    }
    projects.unshift(no_project) unless params[:offset_id].present?


--- a/app/controllers/concerns/lfs_request.rb
+++ b/app/controllers/concerns/lfs_request.rb
@@ -23,7 +23,7 @@ def require_lfs_enabled!
    render(
      json: {
        message: 'Git LFS is not enabled on this GitLab server, contact your admin.',
-        documentation_url: help_url,
+        documentation_url: help_url
      },
      status: 501
    )
@@ -48,7 +48,7 @@ def render_lfs_forbidden
    render(
      json: {
        message: 'Access forbidden. Check your access level.',
-        documentation_url: help_url,
+        documentation_url: help_url
      },
      content_type: "application/vnd.git-lfs+json",
      status: 403
@@ -59,7 +59,7 @@ def render_lfs_not_found
    render(
      json: {
        message: 'Not found.',
-        documentation_url: help_url,
+        documentation_url: help_url
      },
      content_type: "application/vnd.git-lfs+json",
      status: 404

--- a/app/controllers/health_controller.rb
+++ b/app/controllers/health_controller.rb
@@ -5,7 +5,7 @@ class HealthController < ActionController::Base
  CHECKS = [
    Gitlab::HealthChecks::DbCheck,
    Gitlab::HealthChecks::RedisCheck,
-    Gitlab::HealthChecks::FsShardsCheck,
+    Gitlab::HealthChecks::FsShardsCheck
  ].freeze

  def readiness

--- a/app/controllers/jwt_controller.rb
+++ b/app/controllers/jwt_controller.rb
@@ -4,7 +4,7 @@ class JwtController < ApplicationController
  before_action :authenticate_project_or_user

  SERVICES = {
-    Auth::ContainerRegistryAuthenticationService::AUDIENCE => Auth::ContainerRegistryAuthenticationService,
+    Auth::ContainerRegistryAuthenticationService::AUDIENCE => Auth::ContainerRegistryAuthenticationService
  }.freeze

  def auth

--- a/app/controllers/profiles/preferences_controller.rb
+++ b/app/controllers/profiles/preferences_controller.rb
@@ -33,7 +33,7 @@ def preferences_params
      :color_scheme_id,
      :layout,
      :dashboard,
-      :project_view,
+      :project_view
    )
  end
 end
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -209,7 +209,7 @@ def rendered_title
      description_text: @issue.description,
      task_status: @issue.task_status,
      issue_number: @issue.iid,
-      updated_at: @issue.updated_at,
+      updated_at: @issue.updated_at
    }
  end

@@ -269,7 +269,7 @@ def redirect_to_external_issue_tracker
  def issue_params
    params.require(:issue).permit(
      :title, :assignee_id, :position, :description, :confidential,
-      :milestone_id, :due_date, :state_event, :task_num, :lock_version, label_ids: [], assignee_ids: [],
+      :milestone_id, :due_date, :state_event, :task_num, :lock_version, label_ids: [], assignee_ids: []
    )
  end


--- a/app/controllers/projects/lfs_api_controller.rb
+++ b/app/controllers/projects/lfs_api_controller.rb
@@ -22,7 +22,7 @@ def deprecated
    render(
      json: {
        message: 'Server supports batch API only, please update your Git LFS client to version 1.0.1 and up.',
-        documentation_url: "#{Gitlab.config.gitlab.url}/help",
+        documentation_url: "#{Gitlab.config.gitlab.url}/help"
      },
      status: 501
    )
@@ -55,7 +55,7 @@ def download_objects!
      else
        object[:error] = {
          code: 404,
-          message: "Object does not exist on the server or you don't have permissions to access it",
+          message: "Object does not exist on the server or you don't have permissions to access it"
        }
      end
    end

--- a/app/controllers/projects/pipelines_controller.rb
+++ b/app/controllers/projects/pipelines_controller.rb
@@ -44,7 +44,7 @@ def index
            all: @pipelines_count,
            running: @running_count,
            pending: @pending_count,
-            finished: @finished_count,
+            finished: @finished_count
          }
        }
      end

--- a/app/controllers/projects/tree_controller.rb
+++ b/app/controllers/projects/tree_controller.rb
@@ -48,7 +48,7 @@ def assign_dir_vars
    @dir_name = File.join(@path, params[:dir_name])
    @commit_params = {
      file_path: @dir_name,
-      commit_message: params[:commit_message],
+      commit_message: params[:commit_message]
    }
  end
 end
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -220,7 +220,7 @@ def refs
    branches = BranchesFinder.new(@repository, params).execute.map(&:name)

    options = {
-      'Branches' => branches.take(100),
+      'Branches' => branches.take(100)
    }

    unless @repository.tag_count.zero?

--- a/app/helpers/diff_helper.rb
+++ b/app/helpers/diff_helper.rb
@@ -98,7 +98,7 @@ def submodule_link(blob, ref, repository = @repository)
    [
      content_tag(:span, link_to(truncate(blob.name, length: 40), tree)),
      '@',
-      content_tag(:span, commit_id, class: 'monospace'),
+      content_tag(:span, commit_id, class: 'monospace')
    ].join(' ').html_safe
  end


--- a/app/helpers/emails_helper.rb
+++ b/app/helpers/emails_helper.rb
@@ -12,7 +12,7 @@ def email_action(url)
        "action" => {
          "@type" => "ViewAction",
          "name" => name,
-          "url" => url,
+          "url" => url
          }
        }


--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -41,7 +41,7 @@ def event_filter_link(key, tooltip)
    link_opts = {
      class: "event-filter-link",
      id:    "#{key}_event_filter",
-      title: "Filter by #{tooltip.downcase}",
+      title: "Filter by #{tooltip.downcase}"
    }

    content_tag :li, class: active do

--- a/app/helpers/explore_helper.rb
+++ b/app/helpers/explore_helper.rb
@@ -10,7 +10,7 @@ def filter_projects_path(options = {})
      personal: params[:personal],
      archived: params[:archived],
      shared: params[:shared],
-      namespace_id: params[:namespace_id],
+      namespace_id: params[:namespace_id]
    }

    options = exist_opts.merge(options).delete_if { |key, value| value.blank? }

--- a/app/helpers/markup_helper.rb
+++ b/app/helpers/markup_helper.rb
@@ -32,7 +32,7 @@ def link_to_gfm(body, url, html_options = {})
    context = {
      project: @project,
      current_user: (current_user if defined?(current_user)),
-      pipeline: :single_line,
+      pipeline: :single_line
    }
    gfm_body = Banzai.render(body, context)


--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -54,7 +54,7 @@ def mr_change_branches_path(merge_request)
        source_project_id: merge_request.source_project_id,
        target_project_id: merge_request.target_project_id,
        source_branch: merge_request.source_branch,
-        target_branch: merge_request.target_branch,
+        target_branch: merge_request.target_branch
      },
      change_branches: true
    )

--- a/app/helpers/notes_helper.rb
+++ b/app/helpers/notes_helper.rb
@@ -19,7 +19,7 @@ def noteable_json(noteable)
      id: noteable.id,
      class: noteable.class.name,
      resources: noteable.class.table_name,
-      project_id: noteable.project.id,
+      project_id: noteable.project.id
    }.to_json
  end

@@ -34,7 +34,7 @@ def diff_view_line_data(line_code, position, line_type)

    data = {
      line_code: line_code,
-      line_type: line_type,
+      line_type: line_type
    }

    if @use_legacy_diff_notes

--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -42,7 +42,7 @@ def default_autocomplete
      { category: "Settings", label: "User settings",    url: profile_path },
      { category: "Settings", label: "SSH Keys",         url: profile_keys_path },
      { category: "Settings", label: "Dashboard",        url: root_path },
-      { category: "Settings", label: "Admin Section",    url: admin_root_path },
+      { category: "Settings", label: "Admin Section",    url: admin_root_path }
    ]
  end

@@ -57,7 +57,7 @@ def help_autocomplete
      { category: "Help", label: "SSH Keys Help",      url: help_page_path("ssh/README") },
      { category: "Help", label: "System Hooks Help",  url: help_page_path("system_hooks/system_hooks") },
      { category: "Help", label: "Webhooks Help",      url: help_page_path("user/project/integrations/webhooks") },
-      { category: "Help", label: "Workflow Help",      url: help_page_path("workflow/README") },
+      { category: "Help", label: "Workflow Help",      url: help_page_path("workflow/README") }
    ]
  end

@@ -76,7 +76,7 @@ def project_autocomplete
        { category: "Current Project", label: "Milestones",     url: namespace_project_milestones_path(@project.namespace, @project) },
        { category: "Current Project", label: "Snippets",       url: namespace_project_snippets_path(@project.namespace, @project) },
        { category: "Current Project", label: "Members",        url: namespace_project_settings_members_path(@project.namespace, @project) },
-        { category: "Current Project", label: "Wiki",           url: namespace_project_wikis_path(@project.namespace, @project) },
+        { category: "Current Project", label: "Wiki",           url: namespace_project_wikis_path(@project.namespace, @project) }
      ]
    else
      []