Add latest changes from gitlab-org/gitlab@master

2021-11-11 00:12:46 +00:00 · 2021-11-11 00:12:46 +00:00 · 5eba9c0d33
parent 7b2f941669
commit 5eba9c0d33
9 changed files with 54 additions and 8 deletions
--- a/data/deprecations/14-5-deprecate-convert-instance-runner-to-project.yml
+++ b/data/deprecations/14-5-deprecate-convert-instance-runner-to-project.yml
@ -0,0 +1,11 @@
+- name: "Converting an instance (shared) runner to a project (specific) runner is deprecated"
+  announcement_milestone: "14.5" # The milestone when this feature was first announced as deprecated.
+  announcement_date: "2021-11-22"
+  removal_milestone: "15.0" # the milestone when this feature is planned to be removed
+  body: | # Do not modify this line, instead modify the lines below.
+    In GitLab 15.0, we will remove the feature that enables you to convert an instance (shared) runner to a project (specific) runner. Users who need to add a runner to only a particular project can register a runner to the project directly.
+
+  stage: Verify
+  tiers: [Core, Premium, Ultimate]
+  issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345347
+
--- a/data/deprecations/15-0-remove-package-pipelines-api.yml
+++ b/data/deprecations/15-0-remove-package-pipelines-api.yml
@ -0,0 +1,11 @@
+- name: "Package pipelines in API payload is paginated" # The name of the feature to be deprecated
+  announcement_milestone: "14.5" # The milestone when this feature was first announced as deprecated.
+  announcement_date: "2021-11-22" # The date of the milestone release when this feature was first announced as deprecated. This should almost always be the 22nd of a month (YYYY-MM-22), unless you did an out of band blog post.
+  removal_milestone: "15.0" # The milestone when this feature is planned to be removed
+  body: | # Do not modify this line, instead modify the lines below.
+    A request to the API for `/api/v4/projects/:id/packages` returns a paginated result of packages. Each package lists all of its pipelines in this response. This is a performance concern, as it's possible for a package to have hundreds or thousands of associated pipelines.
+
+    In milestone 15.0, we will remove the `pipelines` attribute from the API response.
+  stage: package
+  tiers: Free
+  issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/289956
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@ -8704,6 +8704,7 @@ Represents the total number of issues and their weights for a particular day.
 | <a id="ciminutesnamespacemonthlyusageminutes"></a>`minutes` | [`Int`](#int) | Total number of minutes used by all projects in the namespace. |
 | <a id="ciminutesnamespacemonthlyusagemonth"></a>`month` | [`String`](#string) | Month related to the usage data. |
 | <a id="ciminutesnamespacemonthlyusageprojects"></a>`projects` | [`CiMinutesProjectMonthlyUsageConnection`](#ciminutesprojectmonthlyusageconnection) | CI minutes usage data for projects in the namespace. (see [Connections](#connections)) |
+| <a id="ciminutesnamespacemonthlyusagesharedrunnersduration"></a>`sharedRunnersDuration` | [`Int`](#int) | Total numbers of minutes used by the shared runners in the namespace. |

 ### `CiMinutesProjectMonthlyUsage`

--- a/doc/ci/review_apps/index.md
+++ b/doc/ci/review_apps/index.md
@ -1,6 +1,6 @@
 ---
-stage: Release
-group: Release
+stage: Verify
+group: Testing
 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
 ---
--- a/doc/update/deprecations.md
+++ b/doc/update/deprecations.md
@ -58,6 +58,12 @@ dramatically slow down GitLab instances. For this reason, they are being removed

 Announced: 2021-09-22

+### Converting an instance (shared) runner to a project (specific) runner is deprecated
+
+In GitLab 15.0, we will remove the feature that enables you to convert an instance (shared) runner to a project (specific) runner. Users who need to add a runner to only a particular project can register a runner to the project directly.
+
+Announced: 2021-11-22
+
 ### Deprecate `Versions` on base `PackageType`

 As part of the work to create a [Package Registry GraphQL API](https://gitlab.com/groups/gitlab-org/-/epics/6318), the Package group deprecated the `Version` type for the basic `PackageType` type and moved it to [`PackageDetailsType`](https://docs.gitlab.com/ee/api/graphql/reference/index.html#packagedetailstype).
@ -102,6 +108,14 @@ Note that we are not deprecating the Kerberos SPNEGO integration, only the old p

 Announced: 2021-09-22

+### Package pipelines in API payload is paginated
+
+A request to the API for `/api/v4/projects/:id/packages` returns a paginated result of packages. Each package lists all of its pipelines in this response. This is a performance concern, as it's possible for a package to have hundreds or thousands of associated pipelines.
+
+In milestone 15.0, we will remove the `pipelines` attribute from the API response.
+
+Announced: 2021-11-22
+
 ### REST API Runner will not contain `paused`

 Runner REST API will not return `paused` as a status in GitLab 15.0.
--- a/doc/user/admin_area/settings/terms.md
+++ b/doc/user/admin_area/settings/terms.md
@ -28,13 +28,13 @@ To enforce acceptance of a Terms of Service and Privacy Policy:
 For each update to the terms, a new version is stored. When a user accepts or declines the terms,
 GitLab records which version they accepted or declined.

+Existing users must accept the terms on their next GitLab interaction.
+If a signed-in user declines the terms, they are signed out.
+
 When enabled, it adds a mandatory checkbox to the sign up page for new users:

 ![Sign up form](img/sign_up_terms.png)

-Existing users must accept the terms on their next GitLab interaction.
-If a logged-in user declines the terms, they are signed out.
-
 <!-- ## Troubleshooting

 Include any troubleshooting steps that you can foresee. If you know beforehand what issues
--- a/doc/user/application_security/dast/browser_based.md
+++ b/doc/user/application_security/dast/browser_based.md
@ -54,6 +54,7 @@ The browser-based crawler can be configured using CI/CD variables.
 | `DAST_BROWSER_SCAN`                          | boolean         | `true`                            | Configures DAST to use the browser-based crawler engine. |
 | `DAST_BROWSER_ALLOWED_HOSTS`                 | List of strings | `site.com,another.com`            | Hostnames included in this variable are considered in scope when crawled. By default the `DAST_WEBSITE` hostname is included in the allowed hosts list. |
 | `DAST_BROWSER_EXCLUDED_HOSTS`                | List of strings | `site.com,another.com`            | Hostnames included in this variable are considered excluded and connections are forcibly dropped. |
+| `DAST_BROWSER_EXCLUDED_ELEMENTS`             | selector        | `a[href='2.html'],css:.no-follow` | Comma-separated list of selectors that are ignored when scanning. |
 | `DAST_BROWSER_IGNORED_HOSTS`                 | List of strings | `site.com,another.com`            | Hostnames included in this variable are accessed but not reported against. |
 | `DAST_BROWSER_MAX_ACTIONS`                   | number          | `10000`                           | The maximum number of actions that the crawler performs. For example, clicking a link, or filling a form.  |
 | `DAST_BROWSER_MAX_DEPTH`                     | number          | `10`                              | The maximum number of chained actions that the crawler takes. For example, `Click -> Form Fill -> Click` is a depth of three. |
--- a/jest.config.js
+++ b/jest.config.js
@ -4,7 +4,8 @@ const baseConfig = require('./jest.config.base');

 // TODO: Remove existsSync once jh has added jest.config.js
 if (IS_JH && fs.existsSync('./jh/jest.config.js')) {
-  // eslint-disable-next-line global-require, import/no-unresolved
+  // We can't be explicit with eslint-disable rules because in JH it'll pass import/no-unresolved
+  // eslint-disable-next-line
  module.exports = require('./jh/jest.config');
 } else {
  module.exports = {
--- a/lib/backup/manager.rb
+++ b/lib/backup/manager.rb
@ -99,9 +99,10 @@ module Backup
            # - 1495527122_gitlab_backup.tar
            # - 1495527068_2017_05_23_gitlab_backup.tar
            # - 1495527097_2017_05_23_9.3.0-pre_gitlab_backup.tar
-            next unless file =~ /^(\d{10})(?:_\d{4}_\d{2}_\d{2}(_\d+\.\d+\.\d+((-|\.)(pre|rc\d))?(-ee)?)?)?_gitlab_backup\.tar$/
+            matched = backup_file?(file)
+            next unless matched

-            timestamp = Regexp.last_match(1).to_i
+            timestamp = matched[1].to_i

            if Time.at(timestamp) < (Time.now - keep_time)
              begin
@ -192,6 +193,10 @@ module Backup

    private

+    def backup_file?(file)
+      file.match(/^(\d{10})(?:_\d{4}_\d{2}_\d{2}(_\d+\.\d+\.\d+((-|\.)(pre|rc\d))?(-ee)?)?)?_gitlab_backup\.tar$/)
+    end
+
    def non_tarred_backup?
      File.exist?(File.join(backup_path, 'backup_information.yml'))
    end
@ -314,3 +319,5 @@ module Backup
    end
  end
 end
+
+Backup::Manager.prepend_mod