Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/releases/list/components/release_block_header.vue

@@ -19,8 +19,11 @@ export default {
     },
   },
   computed: {
-    shouldShowEditButton() {
-      return Boolean(this.release._links && this.release._links.edit_url);
+    editLink() {
+      return this.release._links?.edit_url;
+    },
+    selfLink() {
+      return this.release._links?.self;
     },
   },
 };
@@ -29,17 +32,20 @@ export default {
 <template>
   <div class="card-header d-flex align-items-center bg-white pr-0">
     <h2 class="card-title my-2 mr-auto gl-font-size-20">
-      {{ release.name }}
+      <gl-link v-if="selfLink" :href="selfLink" class="font-size-inherit">
+        {{ release.name }}
+      </gl-link>
+      <template v-else>{{ release.name }}</template>
       <gl-badge v-if="release.upcoming_release" variant="warning" class="align-middle">{{
         __('Upcoming Release')
       }}</gl-badge>
     </h2>
     <gl-link
-      v-if="shouldShowEditButton"
+      v-if="editLink"
       v-gl-tooltip
       class="btn btn-default append-right-10 js-edit-button ml-2"
       :title="__('Edit this release')"
-      :href="release._links.edit_url"
+      :href="editLink"
     >
       <icon name="pencil" />
     </gl-link>

app/assets/stylesheets/utilities.scss

@@ -40,6 +40,8 @@
 .mh-50vh { max-height: 50vh; }
+.font-size-inherit { font-size: inherit; }
+
 .gl-w-64 { width: px-to-rem($grid-size * 8); }
 .gl-h-32 { height: px-to-rem($grid-size * 4); }
 .gl-h-64 { height: px-to-rem($grid-size * 8); }

app/models/namespace.rb

@@ -131,6 +131,11 @@ class Namespace < ApplicationRecord
       name = host.delete_suffix(gitlab_host)
       Namespace.find_by_full_path(name)
     end
+
+    # overridden in ee
+    def reset_ci_minutes!(namespace_id)
+      false
+    end
   end
   def visibility_level_field

doc/administration/geo/replication/version_specific_updates.md

@@ -7,9 +7,12 @@ for updating Geo nodes.
 ## Updating to GitLab 12.7
 DANGER: **Danger:**
-We found [an initialization order bug](https://gitlab.com/gitlab-org/gitlab/issues/199672) introduced in GitLab 12.7
-that causes Geo Secondaries to not set the correct database connection pool size. A [fix has been merged](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/24021)
-and will be available in GitLab 12.8 and the next 12.7.x patch release. Please **do not upgrade to 12.7** until the fix is available.
+Only upgrade to GitLab 12.7.5 or later. Do not upgrade to versions 12.7.0
+through 12.7.4 because there is [an initialization order
+bug](https://gitlab.com/gitlab-org/gitlab/issues/199672) that causes Geo
+**secondaries** to set the incorrect database connection pool size. [The
+fix](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/24021) was
+shipped in 12.7.5.
 ## Updating to GitLab 12.2

doc/development/api_graphql_styleguide.md

@@ -226,6 +226,33 @@ end
   policies at once. The fields for these will all have be non-nullable
   booleans with a default description.
+## Feature flags
+
+Features controlled by feature flags often provide GraphQL functionality. When a feature
+is enabled or disabled by a feature flag, the related GraphQL functionality should also
+be enabled or disabled.
+
+Fields can be put behind a feature flag so they can conditionally return the value for
+the field depending on if the feature has been enabled or not.
+
+GraphQL feature flags use the common
+[GitLab feature flag](../development/feature_flags.md) system, and can be added to a
+field using the `feature_key` property.
+
+For example:
+
+```ruby
+field :test_field, type: GraphQL::STRING_TYPE,
+      null: false,
+      description: 'Some test field',
+      feature_key: :some_feature_key
+```
+
+In the above example, the `test_field` field will only be returned if
+the `some_feature_key` feature flag is enabled.
+
+If the feature flag is not enabled, an error will be returned saying the field does not exist.
+
 ## Enums
 GitLab GraphQL enums are defined in `app/graphql/types`. When defining new enums, the

doc/development/documentation/index.md

@@ -520,7 +520,7 @@ also check [the issue](https://gitlab.com/gitlab-org/gitlab-foss/issues/64352) t
 tracked the changes required to implement these rules, and details which rules were
 on or off when markdownlint was enabled on the docs.
-#### `Vale`
+#### Vale
 [Vale](https://errata-ai.github.io/vale/) is a grammar, style, and word usage linter
 for the English language. Vale's configuration is stored in the

doc/development/python_guide/index.md

 # Python Development Guidelines
-GitLab requires Python as a dependency for [reStructuredText](http://docutils.sourceforge.net/rst.html)
+GitLab requires Python as a dependency for [reStructuredText](https://docutils.sourceforge.io/rst.html)
 markup rendering.
 As of GitLab 11.10, we require Python 3.
@@ -51,7 +51,7 @@ omf install pyenv
 ## Dependency management
 While GitLab doesn't directly contain any Python scripts, because we depend on Python to render
-[reStructuredText](http://docutils.sourceforge.net/rst.html) markup, we need to keep track on dependencies
+[reStructuredText](https://docutils.sourceforge.io/rst.html) markup, we need to keep track on dependencies
 on the main project level, so we can run that on our development machines.
 Recently, an equivalent to the `Gemfile` and the [Bundler](https://bundler.io/) project has been introduced to Python:

doc/development/testing_guide/end_to_end/index.md

@@ -179,6 +179,5 @@ you can find an issue you would like to work on in
 [gitlab-issues]: https://gitlab.com/gitlab-org/gitlab/issues?label_name[]=QA&label_name[]=test
 [test environment orchestration scenarios]: https://gitlab.com/gitlab-org/gitlab-qa/tree/master/lib/gitlab/qa/scenario
 [instance-level scenarios]: https://gitlab.com/gitlab-org/gitlab-foss/tree/master/qa/qa/specs/features
-[Page objects documentation]: https://gitlab.com/gitlab-org/gitlab/tree/master/qa/qa/page/README.md
 [instance-qa-readme]: https://gitlab.com/gitlab-org/gitlab/tree/master/qa/README.md
 [instance-qa-examples]: https://gitlab.com/gitlab-org/gitlab-foss/tree/master/qa/qa

doc/development/testing_guide/flaky_tests.md

@@ -55,7 +55,7 @@ This was originally implemented in: <https://gitlab.com/gitlab-org/gitlab-foss/m
 ## Problems we had in the past at GitLab
-- [`rspec-retry` is bitting us when some API specs fail](https://gitlab.com/gitlab-org/gitlab-foss/issues/29242): <https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/9825>
+- [`rspec-retry` is biting us when some API specs fail](https://gitlab.com/gitlab-org/gitlab-foss/issues/29242): <https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/9825>
 - [Sporadic RSpec failures due to `PG::UniqueViolation`](https://gitlab.com/gitlab-org/gitlab-foss/issues/28307#note_24958837): <https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/9846>
   - Follow-up: <https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/10688>
   - [Capybara.reset_session! should be called before requests are blocked](https://gitlab.com/gitlab-org/gitlab-foss/issues/33779): <https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/12224>

doc/user/project/import/github.md

@@ -42,7 +42,7 @@ assignees in the database of the GitLab instance (note that pull requests are ca
 For this association to succeed, prior to the import, each GitHub author and assignee in the repository must
 have either previously logged in to a GitLab account using the GitHub icon **or** have a GitHub account with
-a [public email address](https://help.github.com/en/articles/setting-your-commit-email-address) that
+a [public email address](https://help.github.com/en/github/setting-up-and-managing-your-github-user-account/setting-your-commit-email-address) that
 matches their GitLab account's email address.
 If a user referenced in the project is not found in GitLab's database, the project creator (typically the user

doc/user/project/integrations/github.md

@@ -14,7 +14,7 @@ and is automatically configured on [GitHub import](../../../integration/github.m
 ### Complete these steps on GitHub
-This integration requires a [GitHub API token](https://help.github.com/en/articles/creating-a-personal-access-token-for-the-command-line)
+This integration requires a [GitHub API token](https://help.github.com/en/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line)
 with `repo:status` access granted:
 1. Go to your "Personal access tokens" page at <https://github.com/settings/tokens>

doc/user/project/integrations/microsoft_teams.md

@@ -2,7 +2,8 @@
 ## On Microsoft Teams
-To enable Microsoft Teams integration you must create an incoming webhook integration on Microsoft Teams by following the steps described in this [document](https://docs.microsoft.com/en-us/microsoftteams/platform/concepts/connectors/connectors-using#setting-up-a-custom-incoming-webhook).
+To enable Microsoft Teams integration you must create an incoming webhook integration on Microsoft
+Teams by following the steps described in [Sending messages to Connectors and Webhooks](https://docs.microsoft.com/microsoftteams/platform/webhooks-and-connectors/how-to/connectors-using).
 ## On GitLab

doc/user/project/integrations/prometheus.md

@@ -566,24 +566,24 @@ Grafana metrics can be embedded in [GitLab Flavored Markdown](../../markdown.md)
 #### Embedding charts via Grafana Rendered Images
-It is possible to embed live [Grafana](https://docs.gitlab.com/omnibus/settings/grafana.html) charts in issues, as a [direct linked rendered image](https://grafana.com/docs/reference/sharing/#direct-link-rendered-image).
+It is possible to embed live [Grafana](https://docs.gitlab.com/omnibus/settings/grafana.html) charts in issues, as a [direct linked rendered image](https://grafana.com/docs/grafana/latest/reference/share_panel/#direct-link-rendered-image).
 The sharing dialog within Grafana provides the link, as highlighted below.
 ![Grafana Direct Linked Rendered Image](img/grafana_live_embed.png)
 NOTE: **Note:**
-For this embed to display correctly the Grafana instance must be available to the target user, either as a public dashboard or on the same network.
+For this embed to display correctly, the Grafana instance must be available to the target user, either as a public dashboard or on the same network.
 Copy the link and add an image tag as [inline HTML](../../markdown.md#inline-html) in your Markdown. You may tweak the query parameters as required. For instance, removing the `&from=` and `&to=` parameters will give you a live chart. Here is example markup for a live chart from GitLab's public dashboard:
 ```html
-<img src="https://dashboards.gitlab.com/render/d-solo/RZmbBr7mk/gitlab-triage?orgId=1&refresh=30s&var-env=gprd&var-environment=gprd&var-prometheus=prometheus-01-inf-gprd&var-prometheus_app=prometheus-app-01-inf-gprd&var-backend=All&var-type=All&var-stage=main&panelId=1247&width=1000&height=300"/>
+<img src="https://dashboards.gitlab.com/d/RZmbBr7mk/gitlab-triage?orgId=1&refresh=30s&var-env=gprd&var-environment=gprd&var-prometheus=prometheus-01-inf-gprd&var-prometheus_app=prometheus-app-01-inf-gprd&var-backend=All&var-type=All&var-stage=main&from=1580444107655&to=1580465707655"/>
 ```
 This will render like so:
-<img src="https://dashboards.gitlab.com/render/d-solo/RZmbBr7mk/gitlab-triage?orgId=1&refresh=30s&var-env=gprd&var-environment=gprd&var-prometheus=prometheus-01-inf-gprd&var-prometheus_app=prometheus-app-01-inf-gprd&var-backend=All&var-type=All&var-stage=main&panelId=1247&width=1000&height=300"/>
+![Grafana dashboard embedded preview](img/grafana_embedded.png)
 #### Embedding charts via integration with Grafana HTTP API
@@ -600,7 +600,7 @@ Prerequisites for embedding from a Grafana instance:
 ##### Setting up the Grafana integration
-1. [Generate an Admin-level API Token in Grafana.](https://grafana.com/docs/http_api/auth/#create-api-token)
+1. [Generate an Admin-level API Token in Grafana.](https://grafana.com/docs/grafana/latest/http_api/auth/#create-api-token)
 1. In your GitLab project, navigate to **Settings > Operations > Grafana Authentication**.
 1. To enable the integration, check the "Active" checkbox.
 1. For "Grafana URL", enter the base URL of the Grafana instance.

doc/user/project/issue_board.md

 # Issue Boards
-> [Introduced][ce-5554] in [GitLab 8.11](https://about.gitlab.com/blog/2016/08/22/gitlab-8-11-released/#issue-board).
+> [Introduced][ce-5554] in [GitLab 8.11](https://about.gitlab.com/releases/2016/08/22/gitlab-8-11-released/#issue-board).
 ## Overview
@@ -194,7 +194,7 @@ of the issue card you have selected and drop it in the new list you want.
 ### Configurable Issue Boards **(STARTER)**
-> Introduced in [GitLab Starter Edition 10.2](https://about.gitlab.com/blog/2017/11/22/gitlab-10-2-released/#issue-boards-configuration).
+> Introduced in [GitLab Starter Edition 10.2](https://about.gitlab.com/releases/2017/11/22/gitlab-10-2-released/#issue-boards-configuration).
 An Issue Board can be associated with a GitLab [Milestone](milestones/index.md#milestones),
 [Labels](labels.md), Assignee and Weight
@@ -214,7 +214,7 @@ If you don't have editing permission in a board, you're still able to see the co
 ### Focus mode **(STARTER)**
-> Introduced in [GitLab Starter 9.1](https://about.gitlab.com/blog/2017/04/22/gitlab-9-1-released/#issue-boards-focus-mode-ees-eep).
+> Introduced in [GitLab Starter 9.1](https://about.gitlab.com/releases/2017/04/22/gitlab-9-1-released/#issue-boards-focus-mode-ees-eep).
 Click the button at the top right to toggle focus mode on and off. In focus mode, the navigation UI is hidden, allowing you to focus on issues in the board.
@@ -230,7 +230,7 @@ especially in combination with [assignee lists](#assignee-lists-premium).
 ### Group Issue Boards **(PREMIUM)**
-> Introduced in [GitLab Premium 10.0](https://about.gitlab.com/blog/2017/09/22/gitlab-10-0-released/#group-issue-boards).
+> Introduced in [GitLab Premium 10.0](https://about.gitlab.com/releases/2017/09/22/gitlab-10-0-released/#group-issue-boards).
 Accessible at the group navigation level, a group issue board offers the same features as a project-level board,
 but it can display issues from all projects in that
@@ -239,7 +239,7 @@ boards. When updating milestones and labels for an issue through the sidebar upd
 group-level objects are available.
 NOTE: **Note:**
-Multiple group issue boards were originally introduced in [GitLab 10.0 Premium](https://about.gitlab.com/blog/2017/09/22/gitlab-10-0-released/#group-issue-boards) and
+Multiple group issue boards were originally introduced in [GitLab 10.0 Premium](https://about.gitlab.com/releases/2017/09/22/gitlab-10-0-released/#group-issue-boards) and
 one group issue board per group was made available in GitLab 10.6 Core.
 ![Group issue board](img/group_issue_board.png)

doc/user/project/issues/csv_export.md

 # Export Issues to CSV **(STARTER)**
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/merge_requests/1126) in [GitLab Starter 9.0](https://about.gitlab.com/blog/2017/03/22/gitlab-9-0-released/#export-issues-ees-eep).
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/merge_requests/1126) in [GitLab Starter 9.0](https://about.gitlab.com/releases/2017/03/22/gitlab-9-0-released/#export-issues-ees-eep).
 Issues can be exported as CSV from GitLab and are sent to your default notification email as an attachment.

doc/user/project/issues/multiple_assignees_for_issues.md

@@ -2,7 +2,7 @@
 > **Note:**
 [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/1904)
-in [GitLab Starter 9.2](https://about.gitlab.com/blog/2017/05/22/gitlab-9-2-released/#multiple-assignees-for-issues).
+in [GitLab Starter 9.2](https://about.gitlab.com/releases/2017/05/22/gitlab-9-2-released/#multiple-assignees-for-issues).
 ## Overview

doc/user/project/merge_requests/merge_request_approvals.md

@@ -4,7 +4,7 @@ type: reference, concepts
 # Merge request approvals **(STARTER)**
-> Introduced in [GitLab Enterprise Edition 7.12](https://about.gitlab.com/blog/2015/06/22/gitlab-7-12-released/#merge-request-approvers-ee-only).
+> Introduced in [GitLab Enterprise Edition 7.12](https://about.gitlab.com/releases/2015/06/22/gitlab-7-12-released/#merge-request-approvers-ee-only).
 Merge request approvals enable enforced code review by requiring specified people
 to approve a merge request before it can be merged.

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

@@ -29,7 +29,7 @@ for the most popular hosting services:
 - [Amazon](https://docs.aws.amazon.com/AmazonS3/latest/dev/website-hosting-custom-domain-walkthrough.html)
 - [Bluehost](https://my.bluehost.com/cgi/help/559)
-- [CloudFlare](https://support.cloudflare.com/hc/en-us/articles/200169096-How-do-I-add-A-records-)
+- [CloudFlare](https://support.cloudflare.com/hc/en-us/articles/201720164-Creating-a-Cloudflare-account-and-adding-a-website)
 - [cPanel](https://documentation.cpanel.net/display/84Docs/Edit+DNS+Zone)
 - [DreamHost](https://help.dreamhost.com/hc/en-us/articles/215414867-How-do-I-add-custom-DNS-records-)
 - [Go Daddy](https://www.godaddy.com/help/add-an-a-record-19238)

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

@@ -135,7 +135,7 @@ If you're using CloudFlare, check
 > - **Do not** add any special chars after the default Pages
   domain. E.g., don't point `subdomain.domain.com` to
   or `namespace.gitlab.io/`. Some domain hosting providers may request a trailing dot (`namespace.gitlab.io.`), though.
-> - GitLab Pages IP on GitLab.com [was changed](https://about.gitlab.com/blog/2017/03/06/we-are-changing-the-ip-of-gitlab-pages-on-gitlab-com/) in 2017.
+> - GitLab Pages IP on GitLab.com [was changed](https://about.gitlab.com/releases/2017/03/06/we-are-changing-the-ip-of-gitlab-pages-on-gitlab-com/) in 2017.
 > - GitLab Pages IP on GitLab.com [has changed](https://about.gitlab.com/blog/2018/07/19/gcp-move-update/#gitlab-pages-and-custom-domains)
   from `52.167.214.135` to `35.185.44.232` in 2018.
@@ -162,7 +162,7 @@ from the GitLab project.
 > - Domain verification is **required for GitLab.com users**;
   for GitLab self-managed instances, your GitLab administrator has the option
   to [disabled custom domain verification](../../../../administration/pages/index.md#custom-domain-verification).
-> - [DNS propagation may take some time (up to 24h)](https://www.inmotionhosting.com/support/domain-names/dns-nameserver-changes/domain-names-dns-changes),
+> - [DNS propagation may take some time (up to 24h)](https://www.inmotionhosting.com/support/domain-names/dns-nameserver-changes/domain-names-dns-changes/),
   although it's usually a matter of minutes to complete. Until it does, verification
   will fail and attempts to visit your domain will respond with a 404.
 > - Once your domain has been verified, leave the verification record