Add latest changes from gitlab-org/gitlab@master

app/models/clusters/applications/runner.rb

@@ -3,7 +3,7 @@
 module Clusters
   module Applications
     class Runner < ApplicationRecord
-      VERSION = '0.15.0'
+      VERSION = '0.16.1'
 
       self.table_name = 'clusters_applications_runners'
 

app/models/project_repository_storage_move.rb

@@ -39,8 +39,9 @@ class ProjectRepositoryStorageMove < ApplicationRecord
     after_transition initial: :scheduled do |storage_move, _|
       storage_move.run_after_commit do
         ProjectUpdateRepositoryStorageWorker.perform_async(
-          storage_move.project_id, storage_move.destination_storage_name,
+          storage_move.project_id,
-          repository_storage_move_id: storage_move.id
+          storage_move.destination_storage_name,
+          storage_move.id
         )
       end
     end

app/workers/project_update_repository_storage_worker.rb

@@ -5,7 +5,7 @@ class ProjectUpdateRepositoryStorageWorker # rubocop:disable Scalability/Idempot
 
   feature_category :gitaly
 
-  def perform(project_id, new_repository_storage_key, repository_storage_move_id: nil)
+  def perform(project_id, new_repository_storage_key, repository_storage_move_id = nil)
     repository_storage_move =
       if repository_storage_move_id
         ProjectRepositoryStorageMove.find(repository_storage_move_id)

changelogs/unreleased/remove_kwargs_from_storage_move_worker.yml

@@ -0,0 +1,5 @@
+---
+title: Remove kwargs from storage move worker
+merge_request: 31412
+author:
+type: fixed

changelogs/unreleased/update-gitlab-runner-helm-chart-to-0-16-1.yml

@@ -0,0 +1,5 @@
+---
+title: Update GitLab Runner Helm Chart to 0.16.1
+merge_request: 31492
+author:
+type: other

doc/integration/jira_development_panel.md

@@ -56,7 +56,10 @@ There are no special requirements if you are using GitLab.com.
    this would be `https://gitlab.com/login/oauth/callback`.
 
    NOTE: **Note**:
-   If using a GitLab version earlier than 11.3 the `Redirect URI` value should be `https://<your-gitlab-instance-domain>/-/jira/login/oauth/callback`.
+   If using a GitLab version earlier than 11.3, the `Redirect URI` must be
+   `https://<your-gitlab-instance-domain>/-/jira/login/oauth/callback`. If you want Jira
+   to have access to all projects, GitLab recommends an administrator creates the
+   Application.
 
    ![GitLab Application setup](img/jira_dev_panel_gl_setup_1.png)
 

doc/user/application_security/index.md

@@ -394,6 +394,31 @@ spotbugs-sast:
     - if: $CI_MERGE_REQUEST_ID
 ```
 
+If your override is aimed at limiting jobs to only run on branches, not tags,
+it would look similar to:
+
+```yaml
+include:
+  - template: SAST.gitlab-ci.yml
+
+# Ensure that the scanning is not executed on tags
+spotbugs-sast:
+  except:
+    - tags
+```
+
+To transition to the new `rules` syntax, the override would be rewritten as:
+
+```yaml
+include:
+  - template: SAST.gitlab-ci.yml
+
+# Ensure that the scanning is not executed on tags
+spotbugs-sast:
+  rules:
+    - if: $CI_COMMIT_TAG == null
+```
+
 [Learn more on the usage of `rules`](../../ci/yaml/README.md#rules).
 
 #### Pin your templates to the deprecated versions

doc/user/project/integrations/gitlab_slack_application.md

@@ -1,13 +1,14 @@
 # GitLab Slack application **(FREE ONLY)**
 
+> - Introduced in GitLab 9.4.
+> - Distributed to Slack App Directory in GitLab 10.2.
+
 NOTE: **Note:**
 The GitLab Slack application is only configurable for GitLab.com. It will **not**
 work for on-premises installations where you can configure the
 [Slack slash commands](slack_slash_commands.md) service instead. We're planning
 to make this configurable for all GitLab installations, but there's
 no ETA - see [#28164](https://gitlab.com/gitlab-org/gitlab/issues/28164).
-It was first introduced in GitLab 9.4 and distributed to Slack App Directory in
-GitLab 10.2.
 
 Slack provides a native application which you can enable via your project's
 integrations on GitLab.com.
@@ -35,12 +36,30 @@ docs on [Adding an app to your team](https://slack.com/help/articles/202035138).
 
 To enable GitLab's service for your Slack team:
 
-1. Go to your project's **Settings > Integration > Slack application** (only
+1. Go to your project's **{settings}** **Settings > Integration > Slack application** (only
-   visible on GitLab.com)
+   visible on GitLab.com).
-1. Click the "Add to Slack" button
+1. Click **Add to Slack**.
 
 That's all! You can now start using the Slack slash commands.
 
+## Create a project alias for Slack
+
+To create a project alias on GitLab.com for Slack integration:
+
+1. Go to your project's home page.
+1. Navigate to **{settings}** **Settings > Integrations** (only visible on GitLab.com)
+1. On the **Integrations** page, click **Slack application**.
+1. The current **Project Alias**, if any, is displayed. To edit this value,
+   click **Edit**.
+1. Enter your desired alias, and click **Save changes**.
+
+Some Slack commands require a project alias, and fail with the following error
+if the project alias is incorrect or missing from the command:
+
+```plaintext
+GitLab error: project or alias not found
+```
+
 ## Usage
 
 After confirming the installation, you, and everyone else in your Slack team,

doc/user/project/pages/custom_domains_ssl_tls_certification/dns_concepts.md

@@ -1,5 +1,8 @@
 ---
 type: concepts
+stage: Release
+group: Release Management
+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/#designated-technical-writers
 ---
 
 # DNS records overview

doc/user/project/pages/custom_domains_ssl_tls_certification/index.md

@@ -2,6 +2,9 @@
 last_updated: 2019-07-04
 type: reference, howto
 disqus_identifier: 'https://docs.gitlab.com/ee/user/project/pages/getting_started_part_three.html'
+stage: Release
+group: Release Management
+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/#designated-technical-writers
 ---
 
 # Custom domains and SSL/TLS Certificates

doc/user/project/pages/custom_domains_ssl_tls_certification/lets_encrypt_integration.md

@@ -1,6 +1,9 @@
 ---
 type: reference
 description: "Automatic Let's Encrypt SSL certificates for GitLab Pages."
+stage: Release
+group: Release Management
+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/#designated-technical-writers
 ---
 
 # GitLab Pages integration with Let's Encrypt

doc/user/project/pages/custom_domains_ssl_tls_certification/ssl_tls_concepts.md

@@ -1,5 +1,8 @@
 ---
 type: concepts
+stage: Release
+group: Release Management
+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/#designated-technical-writers
 ---
 
 # SSL/TLS Certificates

doc/user/project/pages/getting_started/fork_sample_project.md

@@ -1,5 +1,8 @@
 ---
 type: reference, howto
+stage: Release
+group: Release Management
+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/#designated-technical-writers
 ---
 
 # New Pages website from a forked sample

doc/user/project/pages/getting_started/new_or_existing_website.md

@@ -1,5 +1,8 @@
 ---
 type: reference, howto
+stage: Release
+group: Release Management
+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/#designated-technical-writers
 ---
 
 # Start a new Pages website from scratch or deploy an existing website

doc/user/project/pages/getting_started/pages_bundled_template.md

@@ -1,5 +1,8 @@
 ---
 type: reference, howto
+stage: Release
+group: Release Management
+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/#designated-technical-writers
 ---
 
 # New Pages website from a bundled template

doc/user/project/pages/getting_started_part_four.md

@@ -1,6 +1,9 @@
 ---
 last_updated: 2020-01-06
 type: reference, howto
+stage: Release
+group: Release Management
+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/#designated-technical-writers
 ---
 
 # Creating and Tweaking GitLab CI/CD for GitLab Pages

doc/user/project/pages/getting_started_part_one.md

@@ -1,6 +1,9 @@
 ---
 last_updated: 2018-06-04
 type: concepts, reference
+stage: Release
+group: Release Management
+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/#designated-technical-writers
 ---
 
 # GitLab Pages domain names, URLs, and baseurls

doc/user/project/pages/index.md

@@ -2,6 +2,9 @@
 description: 'Learn how to use GitLab Pages to deploy a static website at no additional cost.'
 last_updated: 2019-06-04
 type: index, reference
+stage: Release
+group: Release Management
+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/#designated-technical-writers
 ---
 
 # GitLab Pages

doc/user/project/pages/introduction.md

@@ -1,6 +1,9 @@
 ---
 type: reference
 last_updated: 2020-01-06
+stage: Release
+group: Release Management
+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/#designated-technical-writers
 ---
 
 # Exploring GitLab Pages

doc/user/project/pages/pages_access_control.md

@@ -1,5 +1,8 @@
 ---
 type: reference, howto
+stage: Release
+group: Release Management
+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/#designated-technical-writers
 ---
 
 # GitLab Pages Access Control

spec/models/project_repository_storage_move_spec.rb

@@ -46,7 +46,7 @@ RSpec.describe ProjectRepositoryStorageMove, type: :model do
 
       context 'and transits to scheduled' do
         it 'triggers ProjectUpdateRepositoryStorageWorker' do
-          expect(ProjectUpdateRepositoryStorageWorker).to receive(:perform_async).with(project.id, 'test_second_storage', repository_storage_move_id: storage_move.id)
+          expect(ProjectUpdateRepositoryStorageWorker).to receive(:perform_async).with(project.id, 'test_second_storage', storage_move.id)
 
           storage_move.schedule!
         end

spec/models/project_spec.rb

@@ -2844,7 +2844,7 @@ describe Project do
     end
 
     it 'schedules the transfer of the repository to the new storage and locks the project' do
-      expect(ProjectUpdateRepositoryStorageWorker).to receive(:perform_async).with(project.id, 'test_second_storage', repository_storage_move_id: anything)
+      expect(ProjectUpdateRepositoryStorageWorker).to receive(:perform_async).with(project.id, 'test_second_storage', anything)
 
       project.change_repository_storage('test_second_storage')
       project.save!

spec/workers/project_update_repository_storage_worker_spec.rb

@@ -40,7 +40,7 @@ describe ProjectUpdateRepositoryStorageWorker do
         expect(service).to receive(:execute)
 
         expect do
-          subject.perform(nil, nil, repository_storage_move_id: repository_storage_move.id)
+          subject.perform(nil, nil, repository_storage_move.id)
         end.not_to change(ProjectRepositoryStorageMove, :count)
       end
     end