Add latest changes from gitlab-org/gitlab@master

11 files changed, 42 insertions, 14 deletions

diff --git a/app/assets/javascripts/merge_requests/components/sticky_header.vue b/app/assets/javascripts/merge_requests/components/sticky_header.vue
index 6e24e0d22e3..71e214d4fc7 100644
--- a/app/assets/javascripts/merge_requests/components/sticky_header.vue
+++ b/app/assets/javascripts/merge_requests/components/sticky_header.vue
@@ -7,6 +7,8 @@ import {
   GlSafeHtmlDirective,
 } from '@gitlab/ui';
 import { mapGetters, mapState } from 'vuex';
+import { TYPE_MERGE_REQUEST } from '~/graphql_shared/constants';
+import { convertToGraphQLId } from '~/graphql_shared/utils';
 import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { isLoggedIn } from '~/lib/utils/common_utils';
 import StatusBox from '~/issuable/components/status_box.vue';
@@ -47,7 +49,7 @@ export default {
       doneFetchingBatchDiscussions: (state) => state.notes.doneFetchingBatchDiscussions,
     }),
     issuableId() {
-      return `${this.getNoteableData.id}`;
+      return convertToGraphQLId(TYPE_MERGE_REQUEST, this.getNoteableData.id);
     },
     issuableIid() {
       return `${this.getNoteableData.iid}`;
@@ -114,8 +116,8 @@ export default {
               <template #source>
                 <gl-link
                   :title="getNoteableData.source_branch"
+                  :href="getNoteableData.source_branch_path"
                   class="gl-text-blue-500! gl-font-monospace gl-bg-blue-50 gl-rounded-base gl-font-sm gl-px-2 gl-text-truncate gl-max-w-26"
-                  href="/gitlab-org/gitlab-test/-/tree/master-change-vue-comp"
                 >
                   {{ getNoteableData.source_branch }}
                 </gl-link>
@@ -123,8 +125,8 @@ export default {
               <template #target>
                 <gl-link
                   :title="getNoteableData.target_branch"
+                  :href="getNoteableData.target_branch_path"
                   class="gl-text-blue-500! gl-font-monospace gl-bg-blue-50 gl-rounded-base gl-font-sm gl-px-2 gl-text-truncate gl-max-w-26 gl-ml-2"
-                  href="/gitlab-org/gitlab-test/-/tree/master-change-vue-comp"
                 >
                   {{ getNoteableData.target_branch }}
                 </gl-link>
diff --git a/app/assets/javascripts/notes/components/discussion_counter.vue b/app/assets/javascripts/notes/components/discussion_counter.vue
index c15320cdfb8..d08f5e91cc5 100644
--- a/app/assets/javascripts/notes/components/discussion_counter.vue
+++ b/app/assets/javascripts/notes/components/discussion_counter.vue
@@ -86,8 +86,9 @@ export default {
       :class="{
         'gl-bg-orange-50': blocksMerge && !allResolved && !glFeatures.movedMrSidebar,
         'gl-bg-gray-50': !blocksMerge || allResolved || glFeatures.movedMrSidebar,
-        'gl-pr-4': allResolved && !glFeatures.movedMrSidebar,
+        'gl-pr-4': allResolved && glFeatures.movedMrSidebar,
         'gl-pr-2': !allResolved && !glFeatures.movedMrSidebar,
+        'gl-min-h-7': glFeatures.movedMrSidebar,
       }"
       data-testid="discussions-counter-text"
     >
diff --git a/app/assets/javascripts/pages/projects/merge_requests/show/index.js b/app/assets/javascripts/pages/projects/merge_requests/show/index.js
index ac6cbaf4226..d52aaea82cf 100644
--- a/app/assets/javascripts/pages/projects/merge_requests/show/index.js
+++ b/app/assets/javascripts/pages/projects/merge_requests/show/index.js
@@ -5,6 +5,7 @@ import { initIssuableHeaderWarnings } from '~/issuable';
 import initMrNotes from '~/mr_notes';
 import store from '~/mr_notes/stores';
 import initSidebarBundle from '~/sidebar/sidebar_bundle';
+import { apolloProvider } from '~/graphql_shared/issuable_client';
 import initShow from '../init_merge_request_show';
 import getStateQuery from '../queries/get_state.query.graphql';
 
@@ -26,6 +27,7 @@ requestIdleCallback(() => {
     new Vue({
       el,
       store,
+      apolloProvider,
       provide: {
         query: getStateQuery,
         iid,
diff --git a/app/serializers/merge_request_noteable_entity.rb b/app/serializers/merge_request_noteable_entity.rb
index bd0de3a72b9..29bd26c3a15 100644
--- a/app/serializers/merge_request_noteable_entity.rb
+++ b/app/serializers/merge_request_noteable_entity.rb
@@ -10,6 +10,15 @@ class MergeRequestNoteableEntity < IssuableEntity
   expose :state
   expose :source_branch
   expose :target_branch
+
+  expose :source_branch_path, if: -> (merge_request) { merge_request.source_project } do |merge_request|
+    project_tree_path(merge_request.source_project, merge_request.source_branch)
+  end
+
+  expose :target_branch_path, if: -> (merge_request) { merge_request.source_project } do |merge_request|
+    project_tree_path(merge_request.source_project, merge_request.target_branch)
+  end
+
   expose :diff_head_sha
 
   expose :create_note_path do |merge_request|
diff --git a/doc/development/ee_features.md b/doc/development/ee_features.md
index e64ec1c3b9c..869cb0bab0a 100644
--- a/doc/development/ee_features.md
+++ b/doc/development/ee_features.md
@@ -20,7 +20,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 ## Implement a new EE feature
 
-If you're developing a GitLab Starter, GitLab Premium, or GitLab Ultimate licensed feature, use these steps to
+If you're developing a GitLab Premium or GitLab Ultimate licensed feature, use these steps to
 add your new feature or extend it.
 
 GitLab license features are added to [`ee/app/models/gitlab_subscriptions/features.rb`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/app/models/gitlab_subscriptions/features.rb). To determine how
@@ -33,9 +33,9 @@ Use the following questions to guide you:
      must locate the existing feature identifier to [guard it](#guard-your-ee-feature).
    - If this is a new feature, decide on an identifier, such as `my_feature_name`, to add to the
      `features.rb` file.
-1. Is this a **GitLab Starter**, **GitLab Premium**, or **GitLab Ultimate** feature?
-   - Based on the plan you choose to use the feature in, add the feature identifier to `STARTER_FEATURES`,
-     `PREMIUM_FEATURES`, or `ULTIMATE_FEATURES`.
+1. Is this a **GitLab Premium** or **GitLab Ultimate** feature?
+   - Based on the plan you choose to use the feature in, add the feature identifier to `PREMIUM_FEATURES`
+     or `ULTIMATE_FEATURES`.
 1. Will this feature be available globally (system-wide at the GitLab instance level)?
     - Features such as [Geo](../administration/geo/index.md) and
     [Database Load Balancing](../administration/postgresql/database_load_balancing.md) are used by the entire instance
@@ -1128,7 +1128,7 @@ EE licensed features that enhance existing functionality in the UI add new
 elements or interactions to your Vue application as components.
 
 To separate template differences, use a child EE component to separate Vue template differences.
-You must import the EE component [asynchronously](https://vuejs.org/v2/guide/components-dynamic-async.html#Async-Components).
+You must import the EE component [asynchronously](https://v2.vuejs.org/v2/guide/components-dynamic-async.html#Async-Components).
 
 This allows GitLab to load the correct component in EE, while in CE GitLab loads an empty component
 that renders nothing. This code **must** exist in the CE repository, in addition to the EE repository.
diff --git a/doc/development/feature_flags/index.md b/doc/development/feature_flags/index.md
index 502a028f089..2fdbeb26ee5 100644
--- a/doc/development/feature_flags/index.md
+++ b/doc/development/feature_flags/index.md
@@ -433,8 +433,8 @@ When using the percentage rollout of actors on multiple feature flags, the actor
 For example, the following feature flags are enabled for a certain percentage of actors:
 
 ```plaintext
-/chatops run chatops feature set feature-set-1 25 --actors
-/chatops run chatops feature set feature-set-2 25 --actors
+/chatops run feature set feature-set-1 25 --actors
+/chatops run feature set feature-set-2 25 --actors
 ```
 
 If a project A has `:feature-set-1` enabled, there is no guarantee that project A also has `:feature-set-2` enabled.
diff --git a/doc/topics/autodevops/customize.md b/doc/topics/autodevops/customize.md
index 7f9707a6939..8553bc54f2a 100644
--- a/doc/topics/autodevops/customize.md
+++ b/doc/topics/autodevops/customize.md
@@ -425,6 +425,7 @@ applications.
 | `ROLLOUT_RESOURCE_TYPE`                 | Allows specification of the resource type being deployed when using a custom Helm chart. Default value is `deployment`. |
 | `ROLLOUT_STATUS_DISABLED`               | From GitLab 12.0, used to disable rollout status check because it does not support all resource types, for example, `cronjob`. |
 | `STAGING_ENABLED`                       | Used to define a [deploy policy for staging and production environments](#deploy-policy-for-staging-and-production-environments). |
+| `TRACE`                                 | Set to any value to make Helm commands produce verbose output. You can use this setting to help diagnose Auto DevOps deployment problems. |
 
 NOTE:
 After you set up your replica variables using a
diff --git a/doc/topics/autodevops/troubleshooting.md b/doc/topics/autodevops/troubleshooting.md
index 045f843be44..bf3dc27c0e8 100644
--- a/doc/topics/autodevops/troubleshooting.md
+++ b/doc/topics/autodevops/troubleshooting.md
@@ -9,6 +9,12 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 The information in this documentation page describes common errors when using
 Auto DevOps, and any available workarounds.
 
+## Trace Helm commands
+
+Set the CI/CD variable `TRACE` to any value to make Helm commands produce verbose output. You can use this output to diagnose Auto DevOps deployment problems.
+
+You can resolve some problems with Auto DevOps deployment by changing advanced Auto DevOps configuration variables. Read more about [customizing Auto DevOps CI/CD variables](customize.md#cicd-variables).
+
 ## Unable to select a buildpack
 
 Auto Build and Auto Test may fail to detect your language or framework with the
diff --git a/doc/user/application_security/dependency_scanning/index.md b/doc/user/application_security/dependency_scanning/index.md
index bad8e1934fd..ae093dacf50 100644
--- a/doc/user/application_security/dependency_scanning/index.md
+++ b/doc/user/application_security/dependency_scanning/index.md
@@ -452,8 +452,8 @@ We only execute one build in the directory where a build file has been detected.
 multiple Gradle, Maven, or sbt builds, or any combination of these, `gemnasium-maven` only analyzes dependencies for the first build file
 that is detected. Build files are searched for in the following order:
 
-1. `build.gradle` or `build.gradle.kts` for single or [multi-project](https://docs.gradle.org/current/userguide/intro_multi_project_builds.html) Gradle builds.
 1. `pom.xml` for single or [multi-module](https://maven.apache.org/pom.html#Aggregation) Maven projects.
+1. `build.gradle` or `build.gradle.kts` for single or [multi-project](https://docs.gradle.org/current/userguide/intro_multi_project_builds.html) Gradle builds.
 1. `build.sbt` for single or [multi-project](https://www.scala-sbt.org/1.x/docs/Multi-Project.html) sbt builds.
 
 The search begins with the root directory and then continues with subdirectories if no builds are found in the root directory. Consequently an sbt build file in the root directory would be detected before a Gradle build file in a subdirectory.
diff --git a/doc/user/group/access_and_permissions.md b/doc/user/group/access_and_permissions.md
index 4e4b338d661..aaf475733ab 100644
--- a/doc/user/group/access_and_permissions.md
+++ b/doc/user/group/access_and_permissions.md
@@ -17,9 +17,14 @@ Configure your groups to control group permissions and access.
 Group push rules allow group maintainers to set
 [push rules](../project/repository/push_rules.md) for newly created projects in the specific group.
 
-To configure push rules for a group:
+In GitLab 15.4 and later, to configure push rules for a group:
+
+1. On the left sidebar, select Push rules. 
+1. Select the settings you want.
+1. Select **Save Push Rules**.
+
+In GitLab 15.3 and earlier, to configure push rules for a group:
 
-1. On the top bar, select **Menu > Groups** and find your group.
 1. On the left sidebar, select **Settings > Repository** page.
 1. Expand the **Pre-defined push rules** section.
 1. Select the settings you want.
diff --git a/spec/fixtures/api/schemas/entities/merge_request_noteable.json b/spec/fixtures/api/schemas/entities/merge_request_noteable.json
index 705ebcbd843..4b790a2c34b 100644
--- a/spec/fixtures/api/schemas/entities/merge_request_noteable.json
+++ b/spec/fixtures/api/schemas/entities/merge_request_noteable.json
@@ -12,6 +12,8 @@
     "state": { "type": "string" },
     "source_branch": { "type": "string" },
     "target_branch": { "type": "string" },
+    "source_branch_path": { "type": "string" },
+    "target_branch_path": { "type": "string" },
     "diff_head_sha": { "type": "string" },
     "create_note_path": { "type": ["string", "null"] },
     "preview_note_path": { "type": ["string", "null"] },