Add latest changes from gitlab-org/gitlab@master

3 files changed, 126 insertions, 124 deletions

diff --git a/spec/support/helpers/project_template_test_helper.rb b/spec/support/helpers/project_template_test_helper.rb
index 1990cd4551a..bd2fd367fae 100644
--- a/spec/support/helpers/project_template_test_helper.rb
+++ b/spec/support/helpers/project_template_test_helper.rb
@@ -3,14 +3,14 @@
 module ProjectTemplateTestHelper
   def all_templates
     %w[
-        rails spring express iosswift dotnetcore android
-        gomicro gatsby hugo jekyll plainhtml gitbook
-        hexo middleman gitpod_spring_petclinic nfhugo
-        nfjekyll nfplainhtml nfgitbook nfhexo salesforcedx
-        serverless_framework tencent_serverless_framework
-        jsonnet cluster_management kotlin_native_linux
-        pelican bridgetown
-      ]
+      rails spring express iosswift dotnetcore android
+      gomicro gatsby hugo jekyll plainhtml gitbook
+      hexo middleman gitpod_spring_petclinic nfhugo
+      nfjekyll nfplainhtml nfgitbook nfhexo salesforcedx
+      serverless_framework tencent_serverless_framework
+      jsonnet cluster_management kotlin_native_linux
+      pelican bridgetown
+    ]
   end
 end
 
diff --git a/spec/support/helpers/test_env.rb b/spec/support/helpers/test_env.rb
index 4f85eef31fa..1bd468ccfc3 100644
--- a/spec/support/helpers/test_env.rb
+++ b/spec/support/helpers/test_env.rb
@@ -490,12 +490,14 @@ module TestEnv
     # The HEAD of the component_folder will be used as heuristic for the version
     # of the binaries, allowing to use Git to determine if HEAD is later than
     # the expected version. Note: Git considers HEAD to be an anchestor of HEAD.
-    _out, exit_status = Gitlab::Popen.popen(%W[
-      #{Gitlab.config.git.bin_path}
-      -C #{component_folder}
-      merge-base --is-ancestor
-      #{expected_version} HEAD
-])
+    _out, exit_status = Gitlab::Popen.popen(
+      %W[
+        #{Gitlab.config.git.bin_path}
+        -C #{component_folder}
+        merge-base --is-ancestor
+        #{expected_version} HEAD
+      ]
+    )
 
     exit_status == 0
   end
diff --git a/spec/support/helpers/usage_data_helpers.rb b/spec/support/helpers/usage_data_helpers.rb
index e7b5e3717a6..78ceaf297a8 100644
--- a/spec/support/helpers/usage_data_helpers.rb
+++ b/spec/support/helpers/usage_data_helpers.rb
@@ -2,118 +2,118 @@
 
 module UsageDataHelpers
   COUNTS_KEYS = %i(
-      assignee_lists
-      ci_builds
-      ci_internal_pipelines
-      ci_external_pipelines
-      ci_pipeline_config_auto_devops
-      ci_pipeline_config_repository
-      ci_runners
-      ci_triggers
-      ci_pipeline_schedules
-      auto_devops_enabled
-      auto_devops_disabled
-      deploy_keys
-      deployments
-      successful_deployments
-      failed_deployments
-      environments
-      clusters
-      clusters_enabled
-      project_clusters_enabled
-      group_clusters_enabled
-      instance_clusters_enabled
-      clusters_disabled
-      project_clusters_disabled
-      group_clusters_disabled
-      instance_clusters_disabled
-      clusters_platforms_eks
-      clusters_platforms_gke
-      clusters_platforms_user
-      clusters_integrations_prometheus
-      clusters_management_project
-      in_review_folder
-      grafana_integrated_projects
-      groups
-      issues
-      issues_created_from_gitlab_error_tracking_ui
-      issues_with_associated_zoom_link
-      issues_using_zoom_quick_actions
-      issues_with_embedded_grafana_charts_approx
-      incident_issues
-      keys
-      label_lists
-      labels
-      lfs_objects
-      merge_requests
-      milestone_lists
-      milestones
-      notes
-      pool_repositories
-      projects
-      projects_imported_from_github
-      projects_asana_active
-      projects_jenkins_active
-      projects_jira_active
-      projects_jira_server_active
-      projects_jira_cloud_active
-      projects_jira_dvcs_cloud_active
-      projects_jira_dvcs_server_active
-      projects_slack_active
-      projects_slack_slash_commands_active
-      projects_custom_issue_tracker_active
-      projects_mattermost_active
-      projects_prometheus_active
-      projects_with_repositories_enabled
-      projects_with_error_tracking_enabled
-      projects_with_enabled_alert_integrations
-      projects_with_terraform_reports
-      projects_with_terraform_states
-      pages_domains
-      protected_branches
-      protected_branches_except_default
-      releases
-      remote_mirrors
-      snippets
-      personal_snippets
-      project_snippets
-      suggestions
-      terraform_reports
-      terraform_states
-      todos
-      uploads
-      web_hooks
-      user_preferences_user_gitpod_enabled
-    ).freeze
+    assignee_lists
+    ci_builds
+    ci_internal_pipelines
+    ci_external_pipelines
+    ci_pipeline_config_auto_devops
+    ci_pipeline_config_repository
+    ci_runners
+    ci_triggers
+    ci_pipeline_schedules
+    auto_devops_enabled
+    auto_devops_disabled
+    deploy_keys
+    deployments
+    successful_deployments
+    failed_deployments
+    environments
+    clusters
+    clusters_enabled
+    project_clusters_enabled
+    group_clusters_enabled
+    instance_clusters_enabled
+    clusters_disabled
+    project_clusters_disabled
+    group_clusters_disabled
+    instance_clusters_disabled
+    clusters_platforms_eks
+    clusters_platforms_gke
+    clusters_platforms_user
+    clusters_integrations_prometheus
+    clusters_management_project
+    in_review_folder
+    grafana_integrated_projects
+    groups
+    issues
+    issues_created_from_gitlab_error_tracking_ui
+    issues_with_associated_zoom_link
+    issues_using_zoom_quick_actions
+    issues_with_embedded_grafana_charts_approx
+    incident_issues
+    keys
+    label_lists
+    labels
+    lfs_objects
+    merge_requests
+    milestone_lists
+    milestones
+    notes
+    pool_repositories
+    projects
+    projects_imported_from_github
+    projects_asana_active
+    projects_jenkins_active
+    projects_jira_active
+    projects_jira_server_active
+    projects_jira_cloud_active
+    projects_jira_dvcs_cloud_active
+    projects_jira_dvcs_server_active
+    projects_slack_active
+    projects_slack_slash_commands_active
+    projects_custom_issue_tracker_active
+    projects_mattermost_active
+    projects_prometheus_active
+    projects_with_repositories_enabled
+    projects_with_error_tracking_enabled
+    projects_with_enabled_alert_integrations
+    projects_with_terraform_reports
+    projects_with_terraform_states
+    pages_domains
+    protected_branches
+    protected_branches_except_default
+    releases
+    remote_mirrors
+    snippets
+    personal_snippets
+    project_snippets
+    suggestions
+    terraform_reports
+    terraform_states
+    todos
+    uploads
+    web_hooks
+    user_preferences_user_gitpod_enabled
+  ).freeze
 
   USAGE_DATA_KEYS = %i(
-      active_user_count
-      counts
-      counts_monthly
-      recorded_at
-      edition
-      version
-      installation_type
-      uuid
-      hostname
-      mattermost_enabled
-      signup_enabled
-      ldap_enabled
-      gravatar_enabled
-      omniauth_enabled
-      reply_by_email_enabled
-      container_registry_enabled
-      dependency_proxy_enabled
-      gitlab_shared_runners_enabled
-      gitlab_pages
-      git
-      gitaly
-      database
-      prometheus_metrics_enabled
-      web_ide_clientside_preview_enabled
-      object_store
-      topology
-    ).freeze
+    active_user_count
+    counts
+    counts_monthly
+    recorded_at
+    edition
+    version
+    installation_type
+    uuid
+    hostname
+    mattermost_enabled
+    signup_enabled
+    ldap_enabled
+    gravatar_enabled
+    omniauth_enabled
+    reply_by_email_enabled
+    container_registry_enabled
+    dependency_proxy_enabled
+    gitlab_shared_runners_enabled
+    gitlab_pages
+    git
+    gitaly
+    database
+    prometheus_metrics_enabled
+    web_ide_clientside_preview_enabled
+    object_store
+    topology
+  ).freeze
 
   def stub_usage_data_connections
     allow(ActiveRecord::Base.connection).to receive(:transaction_open?).and_return(false)