Automatic merge of gitlab-org/gitlab master

5fcd4f8f · GitLab Bot · 5da471f8 · de0c2a54 · 5fcd4f8f · 5fcd4f8f
Commit 5fcd4f8f authored Aug 03, 2021 by GitLab Bot
12 changed files
--- a/.gitlab/CODEOWNERS
+++ b/.gitlab/CODEOWNERS
@@ -145,7 +145,7 @@
 /doc/api/experiments.md @kpaizee
 /doc/development/experiment_guide/ @kpaizee
 /doc/development/snowplow/ @kpaizee
-/doc/development/usage_ping/ @kpaizee
+/doc/development/service_ping/ @kpaizee
 /doc/user/admin_area/license.md @kpaizee

 [Frontend]

--- a/app/views/projects/mirrors/_mirror_repos_push.html.haml
+++ b/app/views/projects/mirrors/_mirror_repos_push.html.haml
@@ -11,5 +11,5 @@
    = check_box_tag :keep_divergent_refs, '1', false, class: 'js-mirror-keep-divergent-refs form-check-input'
    = label_tag :keep_divergent_refs, _('Keep divergent refs'), class: 'form-check-label'
    .form-text.text-muted
-      = _('By default, if any ref (branch, tag, or commit) on the remote mirror has diverged from the local repository, the entire push will fail, and nothing will be updated. Choose this option to override this behavior. After the mirror is created, this can only be modified via the API.')
-      = link_to _('Learn more.'), help_page_path('user/project/repository/repository_mirroring', anchor: 'keep-divergent-refs'), target: '_blank', rel: 'noopener noreferrer'
+      - link_opening_tag = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe
+      = html_escape(_('Do not force push over diverged refs. After the mirror is created, this setting can only be modified using the API. %{mirroring_docs_link_start}Learn more about this option%{link_closing_tag} and %{mirroring_api_docs_link_start}the API.%{link_closing_tag}')) % { mirroring_docs_link_start: link_opening_tag % {url: help_page_path('user/project/repository/repository_mirroring', anchor: 'keep-divergent-refs')}, mirroring_api_docs_link_start: link_opening_tag % {url: help_page_path('api/remote_mirrors')}, link_closing_tag: '</a>'.html_safe }
--- a/bin/secpick
+++ b/bin/secpick
@@ -39,7 +39,7 @@ module Secpick
      ["git fetch #{@options[:remote]} #{stable_branch}",
       "git checkout -B #{source_branch} #{@options[:remote]}/#{stable_branch} --no-track",
       "git cherry-pick #{@options[:sha]}",
-       "git push #{@options[:remote]} #{source_branch}",
+       "git push #{@options[:remote]} #{source_branch} --no-verify",
       "git checkout #{@options[:branch]}"]
    end


--- a/config/feature_categories.yml
+++ b/config/feature_categories.yml
@@ -9,7 +9,6 @@
 ---
 - accessibility_testing
 - advanced_deployments
- api
 - attack_emulation
 - audit_events
 - audit_reports
@@ -65,14 +64,12 @@
 - infrastructure
 - infrastructure_as_code
 - insider_threat
- insights
 - integrations
 - intel_code_security
 - interactive_application_security_testing
 - internationalization
 - issue_tracking
 - jenkins_importer
- jira_importer
 - kubernetes_management
 - license
 - license_compliance

--- a/doc/api/discussions.md
+++ b/doc/api/discussions.md
@@ -1214,13 +1214,13 @@ Parameters:
 | Attribute                 | Type           | Required | Description |
 | ------------------------- | -------------- | -------- | ----------- |
 | `id`                      | integer/string | yes      | The ID or [URL-encoded path of the project](index.md#namespaced-path-encoding) |
-| `commit_id`               | integer        | yes      | The ID of a commit |
+| `commit_id`               | string         | yes      | The SHA of a commit |
 | `body`                    | string         | yes      | The content of the thread |
 | `created_at`              | string         | no       | Date time string, ISO 8601 formatted, such as `2016-03-11T03:45:40Z` (requires administrator or project/group owner rights) |
 | `position`                | hash           | no       | Position when creating a diff note |
-| `position[base_sha]`      | string         | yes      | Base commit SHA in the source branch |
-| `position[start_sha]`     | string         | yes      | SHA referencing commit in target branch |
-| `position[head_sha]`      | string         | yes      | SHA referencing HEAD of this commit |
+| `position[base_sha]`      | string         | yes      | SHA of the parent commit|
+| `position[start_sha]`     | string         | yes      | SHA of the parent commit |
+| `position[head_sha]`      | string         | yes      | The SHA of this commit (same as `commit_id`) |
 | `position[position_type]` | string         | yes      | Type of the position reference', allowed values: `text` or `image` |
 | `position[new_path]`      | string         | no       | File path after change |
 | `position[new_line]`      | integer        | no       | Line number after change |
@@ -1235,6 +1235,10 @@ Parameters:
 curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/5/commits/11/discussions?body=comment"
 ```

+The rules for creating the API request are the same as when
+[creating a new thread in the merge request diff](#create-a-new-thread-in-the-merge-request-diff),
+with the exception of `base_sha`, `start_sha`, and `head_sha` attributes.
+
 ### Add note to existing commit thread

 Adds a new note to the thread.

--- a/doc/user/project/repository/repository_mirroring.md
+++ b/doc/user/project/repository/repository_mirroring.md
@@ -92,19 +92,18 @@ You can also create and modify project push mirrors through the

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

-By default, if any ref on the remote mirror has diverged from the local
-repository, the *entire push* fails, and no updates occur.
+By default, if any ref (branch or tag) on the remote mirror has diverged from the local repository, the local differences are forced to the remote.

-For example, if a repository has `main`, `develop`, and `stable` branches that
+For example, if a repository has `main` and `develop` branches that
 have been mirrored to a remote, and then a new commit is added to `develop` on
-the mirror, the next push attempt fails, leaving `main` and `stable`
-out-of-date despite not having diverged. No change on any branch can be mirrored
-until the divergence is resolved.
+the remote mirror. The next push updates all of the references on the remote mirror to match
+the local repository, and the new commit added to the remote `develop` branch is lost.

 With the **Keep divergent refs** option enabled, the `develop` branch is
-skipped, allowing `main` and `stable` to be updated. The mirror status
-reflects that `develop` has diverged and was skipped, and be marked as a failed
-update.
+skipped, causing only `main` to be updated. The mirror status
+reflects that `develop` has diverged and was skipped, and be marked as a
+failed update. Refs that exist in the mirror repository but not in the local
+repository are left untouched.

 NOTE:
 After the mirror is created, this option can only be modified via the [API](../../../api/remote_mirrors.md).

--- a/ee/app/controllers/groups/insights_controller.rb
+++ b/ee/app/controllers/groups/insights_controller.rb
@@ -9,7 +9,7 @@ class Groups::InsightsController < Groups::ApplicationController

  track_redis_hll_event :show, name: 'g_analytics_insights'

-  feature_category :insights
+  feature_category :value_stream_management

  private


--- a/ee/app/controllers/projects/insights_controller.rb
+++ b/ee/app/controllers/projects/insights_controller.rb
@@ -11,7 +11,7 @@ class Projects::InsightsController < Projects::ApplicationController

  track_redis_hll_event :show, name: 'p_analytics_insights'

-  feature_category :insights
+  feature_category :value_stream_management

  private


--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -5853,9 +5853,6 @@ msgstr ""
 msgid "By default, all projects and groups will use the global notifications setting."
 msgstr ""

-msgid "By default, if any ref (branch, tag, or commit) on the remote mirror has diverged from the local repository, the entire push will fail, and nothing will be updated. Choose this option to override this behavior. After the mirror is created, this can only be modified via the API."
-msgstr ""
-
 msgid "ByAuthor|by"
 msgstr ""

@@ -11720,6 +11717,9 @@ msgstr ""
 msgid "Do not display offers from third parties"
 msgstr ""

+msgid "Do not force push over diverged refs. After the mirror is created, this setting can only be modified using the API. %{mirroring_docs_link_start}Learn more about this option%{link_closing_tag} and %{mirroring_api_docs_link_start}the API.%{link_closing_tag}"
+msgstr ""
+
 msgid "Do you want to remove this deploy key?"
 msgstr ""


--- a/package.json
+++ b/package.json
@@ -57,9 +57,9 @@
    "@babel/preset-env": "^7.10.1",
    "@gitlab/at.js": "1.5.7",
    "@gitlab/favicon-overlay": "2.0.0",
-    "@gitlab/svgs": "1.205.0",
+    "@gitlab/svgs": "1.207.0",
    "@gitlab/tributejs": "1.0.0",
-    "@gitlab/ui": "31.6.0",
+    "@gitlab/ui": "31.6.1",
    "@gitlab/visual-review-tools": "1.6.1",
    "@rails/actioncable": "6.1.3-2",
    "@rails/ujs": "6.1.3-2",

--- a/spec/support/shared_examples/features/packages_shared_examples.rb
+++ b/spec/support/shared_examples/features/packages_shared_examples.rb
@@ -100,7 +100,7 @@ def click_sort_option(option, ascending)
    # Reset the sort direction
    click_button 'Sort direction' if page.has_selector?('svg[aria-label="Sorting Direction: Ascending"]', wait: 0)

-    find('button.dropdown-menu-toggle').click
+    find('button.gl-dropdown-toggle').click

    page.within('.dropdown-menu') do
      click_button option

--- a/yarn.lock
+++ b/yarn.lock
@@ -898,20 +898,20 @@
    stylelint-declaration-strict-value "1.7.7"
    stylelint-scss "3.18.0"

-"@gitlab/svgs@1.205.0":
-  version "1.205.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.205.0.tgz#f8c084b6ef6a5f7eec676710f2c873992ebc2c83"
-  integrity sha512-cO9uqVCKE8O5ABlCd0m4W9EQrKwQyc536sF9KjwoLAxbqel8mlIo0C3HVIb367NuOpS2IWZdjN7GlNhulwffVA==
+"@gitlab/svgs@1.207.0":
+  version "1.207.0"
+  resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.207.0.tgz#39a1ff30b79a7c1134bcdc086a96e01988b89034"
+  integrity sha512-1JTuocHt1xk3fAP/C7xV79EJNtHmnoIAs+39eY3aidrgTo3hK8XkyANNBAmVooY0RdfUhK3juHfmj7i/C1ps0g==

 "@gitlab/tributejs@1.0.0":
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/@gitlab/tributejs/-/tributejs-1.0.0.tgz#672befa222aeffc83e7d799b0500a7a4418e59b8"
  integrity sha512-nmKw1+hB6MHvlmPz63yPwVs1qQkycHwsKgxpEbzmky16Y6mL4EJMk3w1b8QlOAF/AIAzjCERPhe/R4MJiohbZw==

-"@gitlab/ui@31.6.0":
-  version "31.6.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-31.6.0.tgz#70aeb2b497aea15ea0a0a223b7332bc608587ff1"
-  integrity sha512-HABk7zwF7h5jaNaRiGKnWEkuQiPIm/bDRUzAtV3d/E/OgIzAU9S/fX3SHOrbj44g4Kq3mXifa4omMhEORx+mQg==
+"@gitlab/ui@31.6.1":
+  version "31.6.1"
+  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-31.6.1.tgz#32acb2c9b6ded53077d703c071774c262db4c48b"
+  integrity sha512-x3851iL9N4qIIKqjVquFPuFk4IcrJwMVGCe2iVrCDfOckbHSnvKrR1QYO+wgx/OpLt818hD7BcMXd4R+p1Cz4Q==
  dependencies:
    "@babel/standalone" "^7.0.0"
    bootstrap-vue "2.18.1"