From b6abc9850e69e4e2ab60fa6ababe25da97505edc Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 22 Sep 2022 15:14:42 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .rubocop_todo/style/accessor_grouping.yml     |  7 ++---
 .../javascripts/issues/list/constants.js      |  2 ++
 .../permissions/components/settings_panel.vue |  4 ++-
 app/helpers/users_helper.rb                   | 15 ++++++++++
 app/models/project.rb                         |  3 --
 app/views/groups/_personalize.html.haml       |  2 +-
 .../reference_architectures/10k_users.md      |  2 ++
 .../reference_architectures/25k_users.md      |  2 ++
 .../reference_architectures/2k_users.md       |  2 ++
 .../reference_architectures/3k_users.md       |  3 ++
 .../reference_architectures/50k_users.md      |  2 ++
 .../reference_architectures/5k_users.md       |  2 ++
 .../sidekiq/sidekiq_memory_killer.md          |  2 +-
 doc/development/i18n/proofreader.md           |  1 +
 .../integrations/gitlab_slack_application.md  | 14 +++++++++
 lib/gitlab/usage_data_queries.rb              |  4 ---
 lib/gitlab/utils/usage_data.rb                |  8 -----
 locale/gitlab.pot                             | 29 ++++++++++++++++++-
 .../profiles/user_edit_profile_spec.rb        |  8 +++--
 spec/views/groups/new.html.haml_spec.rb       |  7 +++++
 20 files changed, 92 insertions(+), 27 deletions(-)

diff --git a/.rubocop_todo/style/accessor_grouping.yml b/.rubocop_todo/style/accessor_grouping.yml
index 821e3398301..a2ba217dbcc 100644
--- a/.rubocop_todo/style/accessor_grouping.yml
+++ b/.rubocop_todo/style/accessor_grouping.yml
@@ -1,9 +1,7 @@
 ---
 # Cop supports --auto-correct.
 Style/AccessorGrouping:
-  # Offense count: 254
-  # Temporarily disabled due to too many offenses
-  Enabled: false
+  Details: grace period
   Exclude:
     - 'app/finders/template_finder.rb'
     - 'app/models/commit.rb'
@@ -23,7 +21,6 @@ Style/AccessorGrouping:
     - 'app/models/project.rb'
     - 'app/services/deployments/update_environment_service.rb'
     - 'app/services/issues/clone_service.rb'
-    - 'app/services/merge_requests/bulk_remove_attention_requested_service.rb'
     - 'app/services/note_summary.rb'
     - 'app/services/notification_recipients/builder/default.rb'
     - 'app/services/task_list_toggle_service.rb'
@@ -38,6 +35,7 @@ Style/AccessorGrouping:
     - 'ee/lib/gitlab/ci/reports/security/locations/dast.rb'
     - 'ee/lib/gitlab/ci/reports/security/locations/dependency_scanning.rb'
     - 'lib/feature/definition.rb'
+    - 'lib/gitlab/audit/type/definition.rb'
     - 'lib/gitlab/bitbucket_server_import/importer.rb'
     - 'lib/gitlab/ci/config/external/context.rb'
     - 'lib/gitlab/ci/reports/security/finding.rb'
@@ -65,7 +63,6 @@ Style/AccessorGrouping:
     - 'lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb'
     - 'lib/gitlab/suggestions/file_suggestion.rb'
     - 'lib/gitlab/tracking/event_definition.rb'
-    - 'lib/gitlab/tree_summary.rb'
     - 'lib/gitlab/usage/metric_definition.rb'
     - 'lib/gitlab/usage/metrics/instrumentations/base_metric.rb'
     - 'lib/gitlab/usage/service_ping/instrumented_payload.rb'
diff --git a/app/assets/javascripts/issues/list/constants.js b/app/assets/javascripts/issues/list/constants.js
index 27738d7a3e6..75aa3bfcdca 100644
--- a/app/assets/javascripts/issues/list/constants.js
+++ b/app/assets/javascripts/issues/list/constants.js
@@ -327,10 +327,12 @@ export const filters = {
   [TOKEN_TYPE_HEALTH]: {
     [API_PARAM]: {
       [NORMAL_FILTER]: 'healthStatus',
+      [SPECIAL_FILTER]: 'healthStatus',
     },
     [URL_PARAM]: {
       [OPERATOR_IS]: {
         [NORMAL_FILTER]: 'health_status',
+        [SPECIAL_FILTER]: 'health_status',
       },
     },
   },
diff --git a/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue b/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
index a82f485bf44..040860c8c91 100644
--- a/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
+++ b/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
@@ -898,7 +898,9 @@ export default {
         :help-path="pagesHelpPath"
         :label="$options.i18n.pagesLabel"
         :help-text="
-          s__('ProjectSettings|With GitLab Pages you can host your static websites on GitLab.')
+          s__(
+            'ProjectSettings|With GitLab Pages you can host your static websites on GitLab. GitLab Pages uses a caching mechanism for efficiency. Your changes may not take effect until that cache is invalidated, which usually takes less than a minute.',
+          )
         "
       >
         <project-feature-setting
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 271fa47dd97..4f345fdeb9c 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -287,6 +287,21 @@ module UsersHelper
       }
     ]
   end
+
+  # the keys should match the user model defined roles in app/models/user.rb
+  def localized_user_roles
+    {
+      software_developer: s_('User|Software Developer'),
+      development_team_lead: s_('User|Development Team Lead'),
+      devops_engineer: s_('User|Devops Engineer'),
+      systems_administrator: s_('User|Systems Administrator'),
+      security_analyst: s_('User|Security Analyst'),
+      data_analyst: s_('User|Data Analyst'),
+      product_manager: s_('User|Product Manager'),
+      product_designer: s_('User|Product Designer'),
+      other: s_('User|Other')
+    }.with_indifferent_access.freeze
+  end
 end
 
 UsersHelper.prepend_mod_with('UsersHelper')
diff --git a/app/models/project.rb b/app/models/project.rb
index a1ede87473e..5530ebe0f7a 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -32,7 +32,6 @@ class Project < ApplicationRecord
   include FeatureGate
   include OptionallySearch
   include FromUnion
-  include IgnorableColumns
   include Repositories::CanHousekeepRepository
   include EachBatch
   include GitlabRoutingHelper
@@ -49,8 +48,6 @@ class Project < ApplicationRecord
   BoardLimitExceeded = Class.new(StandardError)
   ExportLimitExceeded = Class.new(StandardError)
 
-  ignore_columns :build_coverage_regex, remove_after: '2022-10-22', remove_with: '15.5'
-
   STATISTICS_ATTRIBUTE = 'repositories_count'
   UNKNOWN_IMPORT_URL = 'http://unknown.git'
   # Hashed Storage versions handle rolling out new storage to project and dependents models:
diff --git a/app/views/groups/_personalize.html.haml b/app/views/groups/_personalize.html.haml
index bae76952ef8..2f55aefb817 100644
--- a/app/views/groups/_personalize.html.haml
+++ b/app/views/groups/_personalize.html.haml
@@ -8,7 +8,7 @@
 .row
   .form-group.col-sm-4
     = label :user, :role, _('Role')
-    = select :user, :role, ::User.roles.keys.map { |role| [role.titleize, role] }, { selected: @current_user.role }, class: 'form-control'
+    = select :user, :role, ::User.roles.keys.map { |role| [localized_user_roles[role] || role.titleize, role] }, { selected: @current_user.role }, class: 'form-control'
 
 .row
   .form-group.col-sm-4
diff --git a/doc/administration/reference_architectures/10k_users.md b/doc/administration/reference_architectures/10k_users.md
index a4172703718..9c58b27a101 100644
--- a/doc/administration/reference_architectures/10k_users.md
+++ b/doc/administration/reference_architectures/10k_users.md
@@ -2018,6 +2018,8 @@ On each node perform the following:
 
 1. [Reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect.
 
+1. If you're not using NFS, [enable incremental logging](#enable-incremental-logging).
+
 1. If you're [using NFS](#configure-nfs-optional):
    1. If necessary, install the NFS client utility packages using the following
       commands:
diff --git a/doc/administration/reference_architectures/25k_users.md b/doc/administration/reference_architectures/25k_users.md
index 22adce85398..5958fba6013 100644
--- a/doc/administration/reference_architectures/25k_users.md
+++ b/doc/administration/reference_architectures/25k_users.md
@@ -2023,6 +2023,8 @@ On each node perform the following:
 
 1. [Reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect.
 
+1. If you're not using NFS, [enable incremental logging](#enable-incremental-logging).
+
 1. If you're [using NFS](#configure-nfs-optional):
    1. If necessary, install the NFS client utility packages using the following
       commands:
diff --git a/doc/administration/reference_architectures/2k_users.md b/doc/administration/reference_architectures/2k_users.md
index 09432e8f6d0..b745731955a 100644
--- a/doc/administration/reference_architectures/2k_users.md
+++ b/doc/administration/reference_architectures/2k_users.md
@@ -748,6 +748,8 @@ On each node perform the following:
 
 1. [Reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect.
 
+1. If you're not using NFS, [enable incremental logging](#enable-incremental-logging).
+
 1. Run `sudo gitlab-rake gitlab:gitaly:check` to confirm the node can connect to Gitaly.
 1. Tail the logs to see the requests:
 
diff --git a/doc/administration/reference_architectures/3k_users.md b/doc/administration/reference_architectures/3k_users.md
index 7cadaff1691..446716aca5d 100644
--- a/doc/administration/reference_architectures/3k_users.md
+++ b/doc/administration/reference_architectures/3k_users.md
@@ -1985,7 +1985,10 @@ On each node perform the following:
 
 1. [Reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect.
 
+1. If you're not using NFS, [enable incremental logging](#enable-incremental-logging).
+
 1. Run `sudo gitlab-rake gitlab:gitaly:check` to confirm the node can connect to Gitaly.
+
 1. Tail the logs to see the requests:
 
    ```shell
diff --git a/doc/administration/reference_architectures/50k_users.md b/doc/administration/reference_architectures/50k_users.md
index 9d5e1f4b6fc..1272423a7f1 100644
--- a/doc/administration/reference_architectures/50k_users.md
+++ b/doc/administration/reference_architectures/50k_users.md
@@ -2040,6 +2040,8 @@ On each node perform the following:
 
 1. [Reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect.
 
+1. If you're not using NFS, [enable incremental logging](#enable-incremental-logging).
+
 1. If you're [using NFS](#configure-nfs-optional):
    1. If necessary, install the NFS client utility packages using the following
       commands:
diff --git a/doc/administration/reference_architectures/5k_users.md b/doc/administration/reference_architectures/5k_users.md
index 10d3553d88c..4653bbd2189 100644
--- a/doc/administration/reference_architectures/5k_users.md
+++ b/doc/administration/reference_architectures/5k_users.md
@@ -1984,6 +1984,8 @@ On each node perform the following:
 
 1. [Reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect.
 
+1. If you're not using NFS, [enable incremental logging](#enable-incremental-logging).
+
 1. Run `sudo gitlab-rake gitlab:gitaly:check` to confirm the node can connect to Gitaly.
 1. Tail the logs to see the requests:
 
diff --git a/doc/administration/sidekiq/sidekiq_memory_killer.md b/doc/administration/sidekiq/sidekiq_memory_killer.md
index 6160e8f3c8c..bbf95bc45ce 100644
--- a/doc/administration/sidekiq/sidekiq_memory_killer.md
+++ b/doc/administration/sidekiq/sidekiq_memory_killer.md
@@ -1,6 +1,6 @@
 ---
 stage: Data Stores
-group: Memory
+group: Application Performance
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
 ---
 
diff --git a/doc/development/i18n/proofreader.md b/doc/development/i18n/proofreader.md
index 1f89c206499..b5d57f9912b 100644
--- a/doc/development/i18n/proofreader.md
+++ b/doc/development/i18n/proofreader.md
@@ -65,6 +65,7 @@ are very appreciative of the work done by translators and proofreaders!
   - Michael Hahnle - [GitLab](https://gitlab.com/mhah), [Crowdin](https://crowdin.com/profile/mhah)
   - Katrin Leinweber - [GitLab](https://gitlab.com/katrinleinweber), [Crowdin](https://crowdin.com/profile/katrinleinweber)
   - Vladislav Wanner - [GitLab](https://gitlab.com/RumBugen), [Crowdin](https://crowdin.com/profile/RumBugen)
+  - Daniel Ziegenberg - [GitLab](https://gitlab.com/ziegenberg), [Crowdin](https://crowdin.com/profile/ziegenberg)
 - Greek
   - Proofreaders needed.
 - Hebrew
diff --git a/doc/user/project/integrations/gitlab_slack_application.md b/doc/user/project/integrations/gitlab_slack_application.md
index 8028dda02c4..237d719b8f4 100644
--- a/doc/user/project/integrations/gitlab_slack_application.md
+++ b/doc/user/project/integrations/gitlab_slack_application.md
@@ -89,3 +89,17 @@ project, you would do:
 In GitLab 15.0 the Slack app is updated to [Slack's new granular permissions app model](https://medium.com/slack-developer-blog/more-precision-less-restrictions-a3550006f9c3).
 
 There is no change in functionality. A reinstall is not required but recommended.
+
+## Troubleshooting
+
+When you work with the Slack app, the
+[App Home](https://api.slack.com/start/overview#app_home) might not display properly.
+As a workaround, ensure your app is up to date.
+
+To update an existing Slack integration:
+
+1. Go to your [chat settings](https://gitlab.com/-/profile/chat_names).
+1. Next to your project, select **Slack application**.
+1. Select **Reinstall Slack app**.
+
+Alternatively, you can [configure a new Slack integration](https://about.gitlab.com/solutions/slack/).
diff --git a/lib/gitlab/usage_data_queries.rb b/lib/gitlab/usage_data_queries.rb
index c2983779603..4486ca53966 100644
--- a/lib/gitlab/usage_data_queries.rb
+++ b/lib/gitlab/usage_data_queries.rb
@@ -75,10 +75,6 @@ module Gitlab
         }
       end
 
-      def epics_deepest_relationship_level
-        { epics_deepest_relationship_level: 0 }
-      end
-
       def topology_usage_data
         {
           duration_s: 0,
diff --git a/lib/gitlab/utils/usage_data.rb b/lib/gitlab/utils/usage_data.rb
index 19bdeefed7e..0b818b99ac7 100644
--- a/lib/gitlab/utils/usage_data.rb
+++ b/lib/gitlab/utils/usage_data.rb
@@ -291,14 +291,6 @@ module Gitlab
         end
       end
 
-      def epics_deepest_relationship_level
-        with_duration do
-          # rubocop: disable UsageData/LargeTable
-          { epics_deepest_relationship_level: ::Epic.deepest_relationship_level.to_i }
-          # rubocop: enable UsageData/LargeTable
-        end
-      end
-
       private
 
       def prometheus_client(verify:)
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 446268a39ea..248dced98d0 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -31639,7 +31639,7 @@ msgstr ""
 msgid "ProjectSettings|Wiki"
 msgstr ""
 
-msgid "ProjectSettings|With GitLab Pages you can host your static websites on GitLab."
+msgid "ProjectSettings|With GitLab Pages you can host your static websites on GitLab. GitLab Pages uses a caching mechanism for efficiency. Your changes may not take effect until that cache is invalidated, which usually takes less than a minute."
 msgstr ""
 
 msgid "ProjectTemplates|.NET Core"
@@ -43594,6 +43594,33 @@ msgstr ""
 msgid "UsersSelect|Unassigned"
 msgstr ""
 
+msgid "User|Data Analyst"
+msgstr ""
+
+msgid "User|Development Team Lead"
+msgstr ""
+
+msgid "User|Devops Engineer"
+msgstr ""
+
+msgid "User|Other"
+msgstr ""
+
+msgid "User|Product Designer"
+msgstr ""
+
+msgid "User|Product Manager"
+msgstr ""
+
+msgid "User|Security Analyst"
+msgstr ""
+
+msgid "User|Software Developer"
+msgstr ""
+
+msgid "User|Systems Administrator"
+msgstr ""
+
 msgid "Uses GitLab as an alternative to Sentry."
 msgstr ""
 
diff --git a/spec/features/profiles/user_edit_profile_spec.rb b/spec/features/profiles/user_edit_profile_spec.rb
index 2740097f056..a4cd2e2c71c 100644
--- a/spec/features/profiles/user_edit_profile_spec.rb
+++ b/spec/features/profiles/user_edit_profile_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 RSpec.describe 'User edit profile' do
   include Spec::Support::Helpers::Features::NotesHelpers
 
-  let(:user) { create(:user) }
+  let_it_be(:user) { create(:user) }
 
   before do
     stub_feature_flags(remove_user_attributes_projects: false)
@@ -456,6 +456,8 @@ RSpec.describe 'User edit profile' do
       end
 
       context 'Remove status button' do
+        let(:user) { create(:user) }
+
         before do
           user.status = UserStatus.new(message: 'Eating bread', emoji: 'stuffed_flatbread')
 
@@ -497,8 +499,8 @@ RSpec.describe 'User edit profile' do
       end
 
       context 'note header' do
-        let(:project) { create(:project_empty_repo, :public) }
-        let(:issue) { create(:issue, project: project) }
+        let_it_be(:project) { create(:project_empty_repo, :public) }
+        let_it_be(:issue) { create(:issue, project: project) }
         let(:emoji) { "stuffed_flatbread" }
 
         before do
diff --git a/spec/views/groups/new.html.haml_spec.rb b/spec/views/groups/new.html.haml_spec.rb
index 5c7378e8dc7..0bbc4c1d717 100644
--- a/spec/views/groups/new.html.haml_spec.rb
+++ b/spec/views/groups/new.html.haml_spec.rb
@@ -36,4 +36,11 @@ RSpec.describe 'groups/new.html.haml' do
       expect(rendered).to have_field('Public')
     end
   end
+
+  describe 'role field' do
+    it 'does have a default selection' do
+      expect(rendered).to have_content('Role')
+      expect(rendered).to have_select('Role', selected: 'Software Developer')
+    end
+  end
 end