Add latest changes from gitlab-org/gitlab@master

app/views/admin/broadcast_messages/_form.html.haml

@@ -77,6 +77,6 @@
       = f.datetime_select :ends_at, {}, class: 'form-control form-control-inline'
   .form-actions
     - if @broadcast_message.persisted?
-      = f.submit "Update broadcast message", class: "btn btn-success"
+      = f.submit "Update broadcast message", class: "btn gl-button btn-success"
     - else
-      = f.submit "Add broadcast message", class: "btn btn-success"
+      = f.submit "Add broadcast message", class: "btn gl-button btn-success"

doc/development/code_review.md

@@ -67,6 +67,10 @@ page, with these behaviors:
    contains the string 'OOO', or the emoji is `:palm_tree:` or `:beach:`.
 1. [Trainee maintainers](https://about.gitlab.com/handbook/engineering/workflow/code-review/#trainee-maintainer)
    are three times as likely to be picked as other reviewers.
+1. People whose [GitLab status](../user/profile/index.md#current-status) emoji
+   is `:large_blue_circle:` are more likely to be picked. This applies to both reviewers and trainee maintainers.
+   - Reviewers with `:large_blue_circle:` are two times as likely to be picked as other reviewers.
+   - Trainee maintainers with `:large_blue_circle:` are four times as likely to be picked as other reviewers.
 1. It always picks the same reviewers and maintainers for the same
    branch name (unless their OOO status changes, as in point 1). It
    removes leading `ce-` and `ee-`, and trailing `-ce` and `-ee`, so

doc/development/i18n/index.md

@@ -38,10 +38,10 @@ Voting for translations is also valuable, helping to confirm good and flag inacc
 
 See [Translation guidelines](translation.md).
 
-### Proof reading
+### Proofreading
 
-Proof reading helps ensure the accuracy and consistency of translations. All
-translations are proof read before being accepted. If a translations requires
+Proofreading helps ensure the accuracy and consistency of translations. All
+translations are proofread before being accepted. If a translations requires
 changes, you will be notified with a comment explaining why.
 
 See [Proofreading Translations](proofreader.md) for more information on who's

locale/gitlab.pot

@@ -16748,6 +16748,9 @@ msgstr ""
 msgid "NetworkPolicies|Name"
 msgstr ""
 
+msgid "NetworkPolicies|Namespace"
+msgstr ""
+
 msgid "NetworkPolicies|Network Policy"
 msgstr ""
 
@@ -22562,9 +22565,6 @@ msgstr ""
 msgid "SecurityReports|Learn more about setting up your dashboard"
 msgstr ""
 
-msgid "SecurityReports|Load more vulnerabilities"
-msgstr ""
-
 msgid "SecurityReports|Monitor vulnerabilities in your code"
 msgstr ""
 

qa/qa/specs/features/api/3_create/repository/default_branch_name_setting_spec.rb

@@ -13,7 +13,7 @@ module QA
         Runtime::ApplicationSettings.restore_application_settings(:default_branch_name)
       end
 
-      it 'sets the default branch name for a new project' do
+      it 'sets the default branch name for a new project', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1018' do
         project = Resource::Project.fabricate_via_api! do |project|
           project.name = "default-branch-name"
           project.initialize_with_readme = true
@@ -32,7 +32,7 @@ module QA
         end
       end
 
-      it 'allows a project to be created via the CLI with a different default branch name' do
+      it 'allows a project to be created via the CLI with a different default branch name', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1019' do
         project_name = "default-branch-name-via-cli-#{SecureRandom.hex(8)}"
         group = Resource::Group.fabricate_via_api!