Add latest changes from gitlab-org/gitlab@master

2020-10-20 00:09:22 +00:00 · 2020-10-20 00:09:22 +00:00 · b0326eded3
parent 376ae6f3b3
commit b0326eded3
31 changed files with 146 additions and 23 deletions
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@ -1307,8 +1307,6 @@ Graphql/IDType:
 FactoryBot/InlineAssociation:
  Exclude:
    - 'ee/spec/factories/analytics/cycle_analytics/group_stages.rb'
-    - 'ee/spec/factories/ci/reports/security/findings.rb'
-    - 'ee/spec/factories/ci/reports/security/reports.rb'
    - 'ee/spec/factories/geo/event_log.rb'
    - 'ee/spec/factories/groups.rb'
    - 'ee/spec/factories/merge_request_blocks.rb'
--- a/doc/administration/auth/smartcard.md
+++ b/doc/administration/auth/smartcard.md
@ -1,4 +1,7 @@
 ---
+stage: none
+group: unassigned
+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
 type: reference
 ---

--- a/doc/administration/compliance.md
+++ b/doc/administration/compliance.md
@ -1,3 +1,9 @@
+---
+stage: none
+group: unassigned
+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
+---
+
 # Compliance features

 You can configure the following GitLab features to help ensure that your GitLab instance meets common compliance standards. Click a feature name for further documentation.
--- a/doc/administration/consul.md
+++ b/doc/administration/consul.md
@ -1,4 +1,7 @@
 ---
+stage: none
+group: unassigned
+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
 type: reference
 ---

--- a/doc/administration/database_load_balancing.md
+++ b/doc/administration/database_load_balancing.md
@ -1,3 +1,9 @@
+---
+stage: none
+group: unassigned
+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
+---
+
 # Database Load Balancing **(PREMIUM ONLY)**

 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1283) in [GitLab Premium](https://about.gitlab.com/pricing/) 9.0.
--- a/doc/administration/housekeeping.md
+++ b/doc/administration/housekeeping.md
@ -1,3 +1,9 @@
+---
+stage: none
+group: unassigned
+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
+---
+
 # Housekeeping

 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/3041) in GitLab 8.4.
--- a/doc/administration/index.md
+++ b/doc/administration/index.md
@ -1,4 +1,7 @@
 ---
+stage: none
+group: unassigned
+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
 description: 'Learn how to install, configure, update, and maintain your GitLab instance.'
 ---

--- a/doc/administration/instance_limits.md
+++ b/doc/administration/instance_limits.md
@ -1,4 +1,7 @@
 ---
+stage: none
+group: unassigned
+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
 type: reference
 ---

--- a/doc/administration/integration/terminal.md
+++ b/doc/administration/integration/terminal.md
@ -1,3 +1,9 @@
+---
+stage: none
+group: unassigned
+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
+---
+
 # Web terminals

 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/7690) in GitLab 8.15.
--- a/doc/administration/libravatar.md
+++ b/doc/administration/libravatar.md
@ -1,4 +1,7 @@
 ---
+stage: none
+group: unassigned
+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
 type: howto
 ---

--- a/doc/administration/load_balancer.md
+++ b/doc/administration/load_balancer.md
@ -1,4 +1,7 @@
 ---
+stage: none
+group: unassigned
+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
 type: reference
 ---

--- a/doc/administration/monitoring/gitlab_self_monitoring_project/index.md
+++ b/doc/administration/monitoring/gitlab_self_monitoring_project/index.md
@ -1,6 +1,6 @@
 ---
 stage: Monitor
-group: APM
+group: Health
 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
 ---

--- a/doc/administration/nfs.md
+++ b/doc/administration/nfs.md
@ -1,4 +1,7 @@
 ---
+stage: none
+group: unassigned
+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
 type: reference
 ---

--- a/doc/administration/object_storage.md
+++ b/doc/administration/object_storage.md
@ -1,4 +1,7 @@
 ---
+stage: none
+group: unassigned
+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
 type: reference
 ---

--- a/doc/administration/operations/cleaning_up_redis_sessions.md
+++ b/doc/administration/operations/cleaning_up_redis_sessions.md
@ -1,3 +1,9 @@
+---
+stage: none
+group: unassigned
+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
+---
+
 # Cleaning up stale Redis sessions

 Since version 6.2, GitLab stores web user sessions as key-value pairs in Redis.
--- a/doc/administration/operations/extra_sidekiq_processes.md
+++ b/doc/administration/operations/extra_sidekiq_processes.md
@ -1,3 +1,9 @@
+---
+stage: none
+group: unassigned
+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
+---
+
 # Run multiple Sidekiq processes **(CORE ONLY)**

 GitLab allows you to start multiple Sidekiq processes.
--- a/doc/administration/operations/fast_ssh_key_lookup.md
+++ b/doc/administration/operations/fast_ssh_key_lookup.md
@ -1,3 +1,9 @@
+---
+stage: none
+group: unassigned
+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
+---
+
 # Fast lookup of authorized SSH keys in the database

 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/1631) in [GitLab Starter](https://about.gitlab.com/pricing/) 9.3.
--- a/doc/administration/operations/filesystem_benchmarking.md
+++ b/doc/administration/operations/filesystem_benchmarking.md
@ -1,3 +1,9 @@
+---
+stage: none
+group: unassigned
+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
+---
+
 # Filesystem Performance Benchmarking

 Filesystem performance has a big impact on overall GitLab performance,
--- a/doc/administration/operations/index.md
+++ b/doc/administration/operations/index.md
@ -1,3 +1,9 @@
+---
+stage: none
+group: unassigned
+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
+---
+
 # Performing Operations in GitLab

 Keep your GitLab instance up and running smoothly.
--- a/doc/administration/operations/moving_repositories.md
+++ b/doc/administration/operations/moving_repositories.md
@ -1,3 +1,9 @@
+---
+stage: none
+group: unassigned
+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
+---
+
 # Moving repositories managed by GitLab

 Sometimes you need to move all repositories managed by GitLab to
--- a/doc/administration/operations/puma.md
+++ b/doc/administration/operations/puma.md
@ -1,3 +1,9 @@
+---
+stage: none
+group: unassigned
+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
+---
+
 # Switching to Puma

 As of GitLab 12.9, [Puma](https://github.com/puma/puma) has replaced [Unicorn](https://yhbt.net/unicorn/)
--- a/doc/administration/operations/sidekiq_memory_killer.md
+++ b/doc/administration/operations/sidekiq_memory_killer.md
@ -1,3 +1,9 @@
+---
+stage: none
+group: unassigned
+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
+---
+
 # Sidekiq MemoryKiller

 The GitLab Rails application code suffers from memory leaks. For web requests
--- a/doc/administration/operations/ssh_certificates.md
+++ b/doc/administration/operations/ssh_certificates.md
@ -1,3 +1,9 @@
+---
+stage: none
+group: unassigned
+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
+---
+
 # User lookup via OpenSSH's AuthorizedPrincipalsCommand

 > [Available in](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/19911) GitLab
--- a/doc/administration/operations/unicorn.md
+++ b/doc/administration/operations/unicorn.md
@ -1,3 +1,9 @@
+---
+stage: none
+group: unassigned
+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
+---
+
 # Understanding Unicorn and unicorn-worker-killer

 NOTE: **Note:**
--- a/doc/development/architecture.md
+++ b/doc/development/architecture.md
@ -236,7 +236,7 @@ Table description links:
 | [GitLab Geo Node](#gitlab-geo)                        | Geographically distributed GitLab nodes |       ⚙        |       ⚙      |        ❌         |     ✅      |   ❌    |  ⚙  | EE Only |
 | [GitLab Managed Apps](#gitlab-managed-apps)           | Deploy Helm, Ingress, Cert-Manager, Prometheus, GitLab Runner, JupyterHub, or Knative to a cluster |  ⤓  |  ⤓  |      ⤓       |     ⤓      |   ⤓    |  ⤓  | CE & EE |
 | [GitLab Pages](#gitlab-pages)                         | Hosts static websites                                                |       ⚙        |      ❌       |        ❌         |     ✅      |   ⚙    |  ⚙  | CE & EE |
-| [GitLab Kubernetes Agent](#gitlab-kubernetes-agent)   | Integrate Kubernetes clusters in a cloud-native way                  |       ❌       |      ⚙        |        ❌         |     ❌      |   ⤓    |  ⚙   | EE Only |
+| [GitLab Kubernetes Agent](#gitlab-kubernetes-agent)   | Integrate Kubernetes clusters in a cloud-native way                  |       ⚙        |      ⚙       |        ❌         |     ❌      |   ⤓    |  ⚙   | EE Only |
 | [GitLab self-monitoring: Alertmanager](#alertmanager) | Deduplicates, groups, and routes alerts from Prometheus              |       ⚙        |      ✅       |        ⚙         |     ✅      |   ❌    |  ❌  | CE & EE |
 | [GitLab self-monitoring: Grafana](#grafana)           | Metrics dashboard                                                    |       ✅        |      ⚙       |        ⤓         |     ✅      |   ❌    |  ❌  | CE & EE |
 | [GitLab self-monitoring: Jaeger](#jaeger)             | View traces generated by the GitLab instance                         |       ❌        |      ⚙       |        ❌         |     ❌      |   ⤓    |  ⚙  | CE & EE |
@ -387,6 +387,7 @@ GitLab Exporter is a process designed in house that allows us to export metrics

 - [Project page](https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent)
 - Configuration:
+  - [Omnibus](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-config-template/gitlab.rb.template)
  - [Charts](https://docs.gitlab.com/charts/charts/gitlab/kas/index.html)

 [GitLab Kubernetes Agent](../user/clusters/agent/index.md) is an active in-cluster
--- a/doc/operations/incident_management/incidents.md
+++ b/doc/operations/incident_management/incidents.md
@ -10,13 +10,13 @@ Incidents are critical entities in incident management workflows. They represent

 ## Incident Creation

-You can create an incident manually or automatically. 
+You can create an incident manually or automatically.

 ### Create incidents manually

 If you have at least Guest [permissions](../../user/permissions.md), to create an Incident, you have two options to do this manually.

-**From the Incidents List:** 
+**From the Incidents List:**

 > [Moved](https://gitlab.com/gitlab-org/monitor/health/-/issues/24) to GitLab core in 13.3.

@ -26,7 +26,7 @@ If you have at least Guest [permissions](../../user/permissions.md), to create a

 ![Incident List Create](./img/incident_list_create_v13_3.png)

-**From the Issues List:**  
+**From the Issues List:**

 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/230857) in GitLab 13.4.

@ -56,7 +56,7 @@ With Maintainer or higher [permissions](../../user/permissions.md), you can enab
   **Send a separate email notification to Developers**. Email notifications will also be sent to users with **Maintainer** and **Owner** permissions.
 1. Click **Save changes**.

-### Create incidents via the PagerDuty webhook 
+### Create incidents via the PagerDuty webhook

 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/119018) in GitLab 13.3.

@ -181,7 +181,7 @@ un-threaded and ordered chronologically, newest to oldest:

 ### Service Level Agreement countdown timer

-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/241663) in GitLab 13.5.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/241663) in [GitLab Premium](https://about.gitlab.com/pricing/) 13.5.

 After enabling **Incident SLA** in the Incident Management configuration, newly-created
 incidents display a SLA (Service Level Agreement) timer showing the time remaining before
--- a/doc/user/clusters/agent/index.md
+++ b/doc/user/clusters/agent/index.md
@ -59,7 +59,7 @@ There are several components that work in concert for the Agent to accomplish Gi

 The setup process involves a few steps to enable GitOps deployments:

-1. Installing the Agent server via GitLab Helm chart.
+1. Installing the Agent server.
 1. Defining a configuration directory.
 1. Creating an Agent record in GitLab.
 1. Generating and copying a Secret token used to connect to the Agent.
@ -68,13 +68,24 @@ The setup process involves a few steps to enable GitOps deployments:

 ### Install the Agent server

-The GitLab Kubernetes Agent can only be deployed through our
-[Helm chart](https://gitlab.com/gitlab-org/charts/gitlab). If you don't already
-have GitLab installed via Helm, please refer to our
-[installation documentation](https://docs.gitlab.com/charts/installation/).
+The GitLab Kubernetes Agent can be deployed using [Omnibus
+GitLab](https://docs.gitlab.com/omnibus/) or the [GitLab
+chart](https://gitlab.com/gitlab-org/charts/gitlab). If you don't already have
+GitLab installed, please refer to our [installation
+documentation](https://docs.gitlab.com/ee/install/README.html).

 NOTE: **Note:**
-GitLab plans to include the Agent in the [official Linux Package](https://gitlab.com/gitlab-org/gitlab/-/issues/223060) and on [GitLab.com](https://gitlab.com/groups/gitlab-org/-/epics/3834).
+GitLab plans to include the Agent on [GitLab.com](https://gitlab.com/groups/gitlab-org/-/epics/3834).
+
+When using the [Omnibus GitLab](https://docs.gitlab.com/omnibus/) package:
+
+1. Edit `/etc/gitlab/gitlab.rb`:
+
+```plaintext
+gitlab_kas['enable'] = true
+```
+
+1. [Reconfigure GitLab](../../../administration/restart_gitlab.md#omnibus-gitlab-reconfigure).

 When installing or upgrading the GitLab Helm chart, consider the following Helm 2 example.
 (If you're using Helm 3, you must modify this example.) You must set `global.kas.enabled=true`
--- a/doc/user/group/saml_sso/index.md
+++ b/doc/user/group/saml_sso/index.md
@ -289,6 +289,11 @@ Similarly, group members of a role with the appropriate permissions can make use

 This can then be compared to the [NameID](#nameid) being sent by the Identity Provider by decoding the message with a [SAML debugging tool](#saml-debugging-tools). We require that these match in order to identify users.

+### Users receive a 404
+
+If a user is trying to sign in for the first time and the GitLab single sign-on URL has not [been configured](#configuring-your-identity-provider), they may see a 404.
+As outlined in the [user access section](#linking-saml-to-your-existing-gitlabcom-account), a group Owner will need to provide the URL to users.
+
 ### Message: "SAML authentication failed: Extern uid has already been taken"

 This error suggests you are signed in as a GitLab user but have already linked your SAML identity to a different GitLab user. Sign out and then try to sign in again using the SSO SAML link, which should log you into GitLab with the linked user account.
--- a/package.json
+++ b/package.json
@ -43,7 +43,7 @@
    "@babel/preset-env": "^7.10.1",
    "@gitlab/at.js": "1.5.5",
    "@gitlab/svgs": "1.171.0",
-    "@gitlab/ui": "21.32.1",
+    "@gitlab/ui": "21.33.0",
    "@gitlab/visual-review-tools": "1.6.1",
    "@rails/actioncable": "^6.0.3-3",
    "@rails/ujs": "^6.0.3-2",
--- a/spec/frontend/ref/components/ref_selector_spec.js
+++ b/spec/frontend/ref/components/ref_selector_spec.js
@ -313,7 +313,7 @@ describe('Ref selector component', () => {
            findBranchesSection()
              .find('[data-testid="section-header"]')
              .text(),
-          ).toBe('Branches 123');
+          ).toMatchInterpolatedText('Branches 123');
        });

        it("does not render an error message in the branches section's body", () => {
@ -392,7 +392,7 @@ describe('Ref selector component', () => {
            findTagsSection()
              .find('[data-testid="section-header"]')
              .text(),
-          ).toBe('Tags 456');
+          ).toMatchInterpolatedText('Tags 456');
        });

        it("does not render an error message in the tags section's body", () => {
@ -460,7 +460,7 @@ describe('Ref selector component', () => {
            findCommitsSection()
              .find('[data-testid="section-header"]')
              .text(),
-          ).toBe('Commits 1');
+          ).toMatchInterpolatedText('Commits 1');
        });

        it("does not render an error message in the comits section's body", () => {
--- a/yarn.lock
+++ b/yarn.lock
@ -866,10 +866,10 @@
  resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.171.0.tgz#abc3092bf804f0898301626130e0f3231834924a"
  integrity sha512-TPfdqIxQDda+0CQHhb9XdF50lmqDmADu6yT8R4oZi6BoUtWLdiHbyFt+RnVU6t7EmjIKicNAii7Ga+f2ljCfUA==

-"@gitlab/ui@21.32.1":
-  version "21.32.1"
-  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-21.32.1.tgz#8ed29de1093afc36ea31d3cf93b047bcfe0c6543"
-  integrity sha512-ZZi/rJfDTXMytX1vNV2FU+l0fG6J7V2+1M7CWIkxdPIPVJ1LopkkfwnbBP29zrwBFBmguXcPoRfTjGa2oSNdbg==
+"@gitlab/ui@21.33.0":
+  version "21.33.0"
+  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-21.33.0.tgz#83dd7e4d65557f7b82ce1f9d7d6e7a1c54cb3dbc"
+  integrity sha512-UBLTz5A1z1Usxw2yfjFNuQ1Ccgx7dYD3M+lDfewDYlU48s0PY7Hm/VXsd543XIuIf+4GEJ1b43kptEZI1wtrbQ==
  dependencies:
    "@babel/standalone" "^7.0.0"
    "@gitlab/vue-toasted" "^1.3.0"