Add latest changes from gitlab-org/gitlab@master

2022-07-12 09:08:50 +00:00 · 2022-07-12 09:08:50 +00:00 · fd8881212e
parent d65c0534ce
commit fd8881212e
21 changed files with 62 additions and 28 deletions
--- a/app/views/admin/identities/_form.html.haml
+++ b/app/views/admin/identities/_form.html.haml
@ -1,5 +1,5 @@
 = form_for [:admin, @user, @identity], html: { class: 'fieldset-form' } do |f|
-  = form_errors(@identity)
+  = form_errors(@identity, pajamas_alert: true)

  .form-group.row
    .col-sm-2.col-form-label
--- a/app/views/shared/doorkeeper/applications/_form.html.haml
+++ b/app/views/shared/doorkeeper/applications/_form.html.haml
@ -1,5 +1,5 @@
 = gitlab_ui_form_for @application, url: url, html: { role: 'form', class: 'doorkeeper-app-form' } do |f|
-  = form_errors(@application)
+  = form_errors(@application, pajamas_alert: true)

  .form-group
    = f.label :name, class: 'label-bold'
--- a/doc/administration/instance_review.md
+++ b/doc/administration/instance_review.md
@ -1,6 +1,6 @@
 ---
 stage: Growth
-group: Conversion
+group: Acquisition
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---

--- a/doc/administration/raketasks/check.md
+++ b/doc/administration/raketasks/check.md
@ -352,23 +352,23 @@ When this scenario is detected, the Rake task displays an error message. For exa

 ```shell
 Checking integrity of Job artifacts
- 3..8: Failures: 2
-  - Job artifact: 3: #<Errno::ENOENT: No such file or directory @ rb_sysopen - /var/opt/gitlab/gitlab-rails/shared/artifacts/4e/07/4e07408562bedb8b60ce05c1decfe3ad16b72230967de01f640b7e4729b49fce/2021_05_26/5/3/job.log>
-  - Job artifact: 8: #<Errno::ENOENT: No such file or directory @ rb_sysopen - /var/opt/gitlab/gitlab-rails/shared/artifacts/4e/07/4e07408562bedb8b60ce05c1decfe3ad16b72230967de01f640b7e4729b49fce/2021_05_26/6/8/job.log>
+- 1..15: Failures: 2
+  - Job artifact: 9: #<Errno::ENOENT: No such file or directory @ rb_sysopen - /var/opt/gitlab/gitlab-rails/shared/artifacts/4b/22/4b227777d4dd1fc61c6f884f48641d02b4d121d3fd328cb08b5531fcacdabf8a/2022_06_30/8/9/job.log>
+  - Job artifact: 15: Remote object does not exist
 Done!

 ```

-To delete these references to missing local artifacts (`job.log` files):
+To delete these references to missing local and/or remote artifacts (`job.log` files):

 1. Open the [GitLab Rails Console](../operations/rails_console.md#starting-a-rails-console-session).
 1. Run the following Ruby code:

   ```ruby
   artifacts_deleted = 0
-   ::Ci::JobArtifact.find_each do |artifact|                       ### Iterate artifacts
+   ::Ci::JobArtifact.find_each do |artifact|                      ### Iterate artifacts
   #  next if artifact.file.filename != "job.log"                 ### Uncomment if only `job.log` files' references are to be processed
-     next if artifact.file.exists?                                ### Skip if the file reference is valid
+     next if artifact.file.file.exists?                           ### Skip if the file reference is valid
     artifacts_deleted += 1
     puts "#{artifact.id}  #{artifact.file.path} is missing."     ### Allow verification before destroy
   #  artifact.destroy!                                           ### Uncomment to actually destroy
--- a/doc/administration/whats-new.md
+++ b/doc/administration/whats-new.md
@ -1,7 +1,7 @@
 ---
-stage: Growth
-group: Adoption
-info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
+stage: none
+group: unassigned
+info: For assistance with this What's new page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments-to-other-projects-and-subjects.
 ---

 # What's new **(FREE)**
--- a/doc/api/broadcast_messages.md
+++ b/doc/api/broadcast_messages.md
@ -1,6 +1,6 @@
 ---
 stage: Growth
-group: Activation
+group: Acquisition
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---

--- a/doc/api/experiments.md
+++ b/doc/api/experiments.md
@ -1,6 +1,6 @@
 ---
 stage: Growth
-group: Expansion
+group: Acquisition
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---

--- a/doc/api/invitations.md
+++ b/doc/api/invitations.md
@ -1,6 +1,6 @@
 ---
 stage: Growth
-group: Expansion
+group: Acquisition
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---

--- a/doc/development/code_review.md
+++ b/doc/development/code_review.md
@ -79,6 +79,16 @@ page, with these behaviors:
      - **Out sick** - 🌡️ `:thermometer:`, 🤒 `:face_with_thermometer:`
      - **At capacity** - 🔴 `:red_circle:`
      - **Focus mode** - 💡 `:bulb:` (focusing on their team's work)
+1. It doesn't pick people who are already assigned a number of reviews that is equal to
+   or greater than their chosen "review limit". The review limit is the maximum number of
+   reviews people are ready to handle at a time. Set a review limit by using one of the following
+   as a Slack or [GitLab status](../user/profile/index.md#set-your-current-status):
+   - 0️⃣ - `:zero:` (similar to `:red_circle:`)
+   - 1️⃣ - `:one:`
+   - 2️⃣ - `:two:`
+   - 3️⃣ - `:three:`
+   - 4️⃣ - `:four:`
+   - 5️⃣ - `:five:`
 1. Team members whose Slack or [GitLab status](../user/profile/index.md#set-your-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.
--- a/doc/development/experiment_guide/experiment_code_reviews.md
+++ b/doc/development/experiment_guide/experiment_code_reviews.md
@ -1,6 +1,6 @@
 ---
 stage: Growth
-group: Adoption
+group: Acquisition
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---

--- a/doc/development/experiment_guide/experiment_rollout.md
+++ b/doc/development/experiment_guide/experiment_rollout.md
@ -1,6 +1,6 @@
 ---
 stage: Growth
-group: Adoption
+group: Acquisition
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---

--- a/doc/development/experiment_guide/implementing_experiments.md
+++ b/doc/development/experiment_guide/implementing_experiments.md
@ -1,6 +1,6 @@
 ---
 stage: Growth
-group: Adoption
+group: Acquisition
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---

--- a/doc/development/experiment_guide/index.md
+++ b/doc/development/experiment_guide/index.md
@ -1,6 +1,6 @@
 ---
 stage: Growth
-group: Activation
+group: Acquisition
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---

--- a/doc/development/experiment_guide/testing_experiments.md
+++ b/doc/development/experiment_guide/testing_experiments.md
@ -1,6 +1,6 @@
 ---
 stage: Growth
-group: Activation
+group: Acquisition
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---

--- a/doc/development/product_qualified_lead_guide/index.md
+++ b/doc/development/product_qualified_lead_guide/index.md
@ -1,6 +1,6 @@
 ---
 stage: Growth
-group: Conversion
+group: Acquisition
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---

--- a/doc/user/admin_area/broadcast_messages.md
+++ b/doc/user/admin_area/broadcast_messages.md
@ -1,6 +1,6 @@
 ---
 stage: Growth
-group: Activation
+group: Acquisition
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 type: reference, howto
 ---
--- a/doc/user/free_user_limit.md
+++ b/doc/user/free_user_limit.md
@ -1,6 +1,6 @@
 ---
 stage: Growth
-group: Conversion
+group: Acquisition
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---

--- a/doc/user/project/integrations/mock_ci.md
+++ b/doc/user/project/integrations/mock_ci.md
@ -6,7 +6,8 @@ info: To determine the technical writer assigned to the Stage/Group associated w

 # Mock CI Service **(FREE)**

-**NB: This service is only listed if you are in a development environment!**
+NOTE:
+This service is only listed if you are in a [development environment](https://gitlab.com/gitlab-org/gitlab-mock-ci-service#setup-mockci-integration)!

 To set up the mock CI service server, respond to the following endpoints

--- a/qa/qa.rb
+++ b/qa/qa.rb
@ -17,6 +17,8 @@ require 'active_support/core_ext/hash'
 require 'active_support/core_ext/object/blank'
 require 'rainbow/refinement'

+require_relative 'qa/support/fips'
+
 module QA
  root = "#{__dir__}/qa"

--- a/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb
+++ b/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb
@ -33,12 +33,19 @@ module QA
      end

      keys = [
-        ['https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348022', Runtime::Key::RSA, 8192],
-        ['https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348021', Runtime::Key::ECDSA, 521],
-        ['https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348020', Runtime::Key::ED25519]
+        ['https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348022', Runtime::Key::RSA, 8192, true],
+        ['https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348021', Runtime::Key::ECDSA, 521, true],
+        ['https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/348020', Runtime::Key::ED25519, false]
      ]

-      keys.each do |(testcase, key_class, bits)|
+      supported_keys =
+        if QA::Support::FIPS.enabled?
+          keys.select { |(_, _, _, allowed_in_fips)| allowed_in_fips }
+        else
+          keys
+        end
+
+      supported_keys.each do |(testcase, key_class, bits, _)|
        it "user sets up a deploy key with #{key_class}(#{bits}) to clone code using pipelines", testcase: testcase do
          key = key_class.new(*bits)

--- a/qa/qa/support/fips.rb
+++ b/qa/qa/support/fips.rb
@ -0,0 +1,14 @@
+# rubocop: disable Naming/FileName
+# frozen_string_literal: true
+
+module QA
+  module Support
+    class FIPS
+      def self.enabled?
+        %(1 true yes).include?(ENV['FIPS'].to_s)
+      end
+    end
+  end
+end
+
+# rubocop: enable Naming/FileName