Add latest changes from gitlab-org/gitlab@master

Gemfile

@@ -72,7 +72,7 @@ gem 'u2f', '~> 0.2.1'
 
 # GitLab Pages
 gem 'validates_hostname', '~> 1.0.11'
-gem 'rubyzip', '~> 2.0.0', require: 'zip'
+gem 'rubyzip', '~> 2.3.2', require: 'zip'
 # GitLab Pages letsencrypt support
 gem 'acme-client', '~> 2.0', '>= 2.0.9'
 

Gemfile.lock

@@ -1131,7 +1131,7 @@ GEM
       sexp_processor (~> 4.9)
     rubyntlm (0.6.2)
     rubypants (0.2.0)
-    rubyzip (2.0.0)
+    rubyzip (2.3.2)
     rugged (1.2.0)
     safe_yaml (1.0.4)
     safety_net_attestation (0.4.0)
@@ -1608,7 +1608,7 @@ DEPENDENCIES
   ruby-progressbar (~> 1.10)
   ruby-saml (~> 1.13.0)
   ruby_parser (~> 3.15)
-  rubyzip (~> 2.0.0)
+  rubyzip (~> 2.3.2)
   rugged (~> 1.2)
   sanitize (~> 6.0)
   sassc-rails (~> 2.1.0)

config/feature_flags/development/new_route_ci_minutes_purchase.yml

@@ -1,8 +0,0 @@
----
-name: new_route_ci_minutes_purchase
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54934
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/322582
-milestone: '13.10'
-type: development
-group: group::purchase
-default_enabled: true

data/deprecations/14-8-protect-vulnerability-check.yml

@@ -1,6 +1,6 @@
 - name: "Vulnerability Check"
   announcement_milestone: "14.8"
-  announcement_date: "2021-02-22"
+  announcement_date: "2022-02-22"
   removal_milestone: "15.0"
   removal_date: "2022-05-22"
   breaking_change: true

doc/development/documentation/styleguide/word_list.md

@@ -78,6 +78,15 @@ Instead of:
 Use title case **Admin Area** to refer to the area of the UI that you access when you select **Menu > Admin**.
 This area of the UI says **Admin Area** at the top of the page and on the menu.
 
+## Agent
+
+Use **Agent** to refer to the [GitLab Agent for Kubernetes](https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent).
+Capitalize the word **Agent**. For example:
+
+- Install the GitLab Agent.
+- Install the Agent in your cluster.
+- Select an Agent from the list.
+
 ## allow, enable
 
 Try to avoid **allow** and **enable**, unless you are talking about security-related features.

doc/user/clusters/agent/ci_cd_tunnel.md

@@ -46,6 +46,13 @@ Also, each Agent has a separate context (`kubecontext`).
 The Tunnel uses this information to safely allow access to the cluster from
 jobs running in the projects you authorized.
 
+### `~/.kube/cache` permissions
+ 
+`kubectl` and other tools based on the same libraries (such as Helm, `kpt`, and `kustomize`) cache information about
+the cluster in `~/.kube/cache`. If this directory is not writable, the tool fetches information on each invocation,
+making interactions slower and creating unnecessary load on the cluster. Make sure that this directory in the container image
+you use is writable for the best experience.
+
 ## Configure the CI/CD Tunnel
 
 The CI/CD Tunnel is configured directly through the

doc/user/infrastructure/iac/terraform_state.md

@@ -74,9 +74,8 @@ local machine, this is a simple way to get started:
 1. On your local machine, run `terraform init`, passing in the following options,
    replacing `<YOUR-STATE-NAME>`, `<YOUR-PROJECT-ID>`,  `<YOUR-USERNAME>` and
    `<YOUR-ACCESS-TOKEN>` with the relevant values. This command initializes your
-   Terraform state, and stores that state in your GitLab project. The name of
-   your state can contain only uppercase and lowercase letters, decimal digits,
-   hyphens, and underscores. This example uses `gitlab.com`:
+   Terraform state, and stores that state in your GitLab project. This example
+   uses `gitlab.com`:
 
    ```shell
    terraform init \
@@ -90,6 +89,10 @@ local machine, this is a simple way to get started:
        -backend-config="retry_wait_min=5"
    ```
 
+   WARNING:
+   The name of your state can contain only uppercase and lowercase letters, decimal digits,
+   hyphens, and underscores.
+
 If you already have a GitLab-managed Terraform state, you can use the `terraform init` command
 with the pre-populated parameters values:
 

lib/gitlab/email/handler/service_desk_handler.rb

@@ -177,7 +177,7 @@ module Gitlab
         end
 
         def from_address
-          mail.from.first || mail.sender
+          (mail.reply_to || []).first || mail.from.first || mail.sender
         end
 
         def can_handle_legacy_format?

spec/features/issues/user_interacts_with_awards_spec.rb

@@ -49,7 +49,7 @@ RSpec.describe 'User interacts with awards' do
       end
     end
 
-    it 'toggles a custom award emoji' do
+    it 'toggles a custom award emoji', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/351878' do
       page.within('.awards') do
         page.find('.add-reaction-button').click
       end

spec/fixtures/emails/service_desk_reply_to_sender_and_from.eml

@@ -1,28 +0,0 @@
-Delivered-To: incoming+email-test-project_id-issue-@appmail.adventuretime.ooo
-Return-Path: <jake@adventuretime.ooo>
-Received: from iceking.adventuretime.ooo ([unix socket]) by iceking (Cyrus v2.2.13-Debian-2.2.13-19+squeeze3) with LMTPA; Thu, 13 Jun 2013 17:03:50 -0400
-Received: from mail-ie0-x234.google.com (mail-ie0-x234.google.com [IPv6:2607:f8b0:4001:c03::234]) by iceking.adventuretime.ooo (8.14.3/8.14.3/Debian-9.4) with ESMTP id r5DL3nFJ016967 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NOT) for <incoming+gitlabhq/gitlabhq@appmail.adventuretime.ooo>; Thu, 13 Jun 2013 17:03:50 -0400
-Received: by mail-ie0-f180.google.com with SMTP id f4so21977375iea.25 for <incoming+email-test-project_id-issue-@appmail.adventuretime.ooo>; Thu, 13 Jun 2013 14:03:48 -0700
-Received: by 10.0.0.1 with HTTP; Thu, 13 Jun 2013 14:03:48 -0700
-Date: Thu, 13 Jun 2013 17:03:48 -0400
-From: Finn the Human <finn@adventuretime.ooo>
-Reply-To: Finn the Hooman <hooman@adventuretime.ooo>
-Sender: Jake the Dog <jake@adventuretime.ooo>
-To: support@adventuretime.ooo
-Delivered-To: support@adventuretime.ooo
-Message-ID: <CADkmRc+rNGAGGbV2iE5p918UVy4UyJqVcXRO2=otppgzduJSg@mail.gmail.com>
-Subject: The message subject! @all
-Mime-Version: 1.0
-Content-Type: text/plain;
- charset=ISO-8859-1
-Content-Transfer-Encoding: 7bit
-X-Sieve: CMU Sieve 2.2
-X-Received: by 10.0.0.1 with SMTP id n7mr11234144ipb.85.1371157428600; Thu,
- 13 Jun 2013 14:03:48 -0700 (PDT)
-X-Scanned-By: MIMEDefang 2.69 on IPv6:2001:470:1d:165::1
-
-Service desk stuff!
-
-```
-a = b
-```

spec/lib/gitlab/email/handler/service_desk_handler_spec.rb

@@ -478,20 +478,6 @@ RSpec.describe Gitlab::Email::Handler::ServiceDeskHandler do
       end
     end
 
-    context 'when there is a reply-to address, a sender address, and a from address' do
-      let(:email_raw) { email_fixture('emails/service_desk_reply_to_sender_and_from.eml') }
-
-      it 'ignores the reply-to and prefers the from address' do
-        setup_attachment
-
-        expect { receiver.execute }.to change { Issue.count }.by(1)
-
-        new_issue = Issue.last
-
-        expect(new_issue.external_author).to eq('finn@adventuretime.ooo')
-      end
-    end
-
     context 'when service desk is not enabled for project' do
       before do
         allow(Gitlab::ServiceDesk).to receive(:enabled?).and_return(false)