Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

GITALY_SERVER_VERSION

@@ -1 +1 @@
-4d333b2bb343d59410a80873e6185b8f8a2061a3
+6bd8110489a44adeacff1897a757d8ea52bf4f87

app/assets/javascripts/repository/components/header_area/blob_controls.vue

@@ -23,6 +23,7 @@ import { FIND_FILE_BUTTON_CLICK } from '~/tracking/constants';
 import { updateElementsVisibility } from '~/repository/utils/dom';
 import blobControlsQuery from '~/repository/queries/blob_controls.query.graphql';
 import { getRefType } from '~/repository/utils/ref_type';
+import OpenMrBadge from '~/repository/components/header_area/open_mr_badge.vue';
 import { TEXT_FILE_TYPE, DEFAULT_BLOB_INFO } from '../../constants';
 import OverflowMenu from './blob_overflow_menu.vue';
 
@@ -36,6 +37,7 @@ export default {
   },
   buttonClassList: 'sm:gl-w-auto gl-w-full sm:gl-mt-0 gl-mt-3',
   components: {
+    OpenMrBadge,
     GlButton,
     OverflowMenu,
   },
@@ -192,6 +194,11 @@ export default {
 </script>
 <template>
   <div v-if="showBlobControls" class="gl-flex gl-flex-wrap gl-items-center gl-gap-3">
+    <open-mr-badge
+      v-if="glFeatures.filterBlobPath"
+      :project-path="projectPath"
+      :blob-path="filePath"
+    />
     <gl-button
       v-gl-tooltip.html="findFileTooltip"
       :aria-keyshortcuts="findFileShortcutKey"

app/assets/javascripts/repository/components/header_area/blob_overflow_menu.vue

@@ -126,6 +126,7 @@ export default {
     data-testid="default-actions-container"
     :toggle-text="$options.i18n.dropdownLabel"
     text-sr-only
+    category="tertiary"
   >
     <permalink-dropdown-item :permalink-path="blobInfo.permalinkPath" />
     <blob-button-group

app/assets/javascripts/repository/components/header_area/open_mr_badge.vue

@@ -0,0 +1,80 @@
+<script>
+import { GlBadge } from '@gitlab/ui';
+import { sprintf, __ } from '~/locale';
+import getOpenMrCountsForBlobPath from '~/repository/queries/open_mr_counts.query.graphql';
+import { nDaysBefore } from '~/lib/utils/datetime/date_calculation_utility';
+import { toYmd } from '~/analytics/shared/utils';
+import { logError } from '~/lib/logger';
+import * as Sentry from '~/sentry/sentry_browser_wrapper';
+
+const OPEN_MR_AGE_LIMIT_DAYS = 30;
+
+export default {
+  components: {
+    GlBadge,
+  },
+  inject: ['currentRef'],
+  props: {
+    projectPath: {
+      type: String,
+      required: true,
+    },
+    blobPath: {
+      type: String,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      openMrsCount: null,
+    };
+  },
+  computed: {
+    openMRsCountText() {
+      return sprintf(__('%{count} open'), { count: this.openMrsCount });
+    },
+    createdAfter() {
+      const lookbackDate = nDaysBefore(new Date(), OPEN_MR_AGE_LIMIT_DAYS - 1, { utc: true });
+      return toYmd(lookbackDate);
+    },
+    isLoading() {
+      return this.$apollo.queries.loading;
+    },
+    showBadge() {
+      return !this.isLoading && this.openMrsCount > 0;
+    },
+    queryVariables() {
+      return {
+        projectPath: this.projectPath,
+        targetBranch: [this.currentRef],
+        blobPath: this.blobPath,
+        createdAfter: this.createdAfter,
+      };
+    },
+  },
+  apollo: {
+    openMrsCount: {
+      query: getOpenMrCountsForBlobPath,
+      variables() {
+        return this.queryVariables;
+      },
+      update({ project: { mergeRequests: { count } = {} } = {} } = {}) {
+        return count;
+      },
+      error(error) {
+        logError(
+          `Failed to fetch merge request count. See exception details for more information.`,
+          error,
+        );
+        Sentry.captureException(error);
+      },
+    },
+  },
+};
+</script>
+
+<template>
+  <gl-badge v-if="showBadge" variant="success" icon="merge-request">
+    {{ openMRsCountText }}
+  </gl-badge>
+</template>

app/assets/javascripts/repository/queries/open_mr_counts.query.graphql

@@ -0,0 +1,18 @@
+query getOpenMrCountsForBlobPath(
+  $projectPath: ID!
+  $targetBranch: [String!]
+  $blobPath: String!
+  $createdAfter: Time!
+) {
+  project(fullPath: $projectPath) {
+    id
+    mergeRequests(
+      state: opened
+      targetBranches: $targetBranch
+      blobPath: $blobPath
+      createdAfter: $createdAfter
+    ) {
+      count
+    }
+  }
+}

app/assets/javascripts/vue_shared/components/notes/system_note.vue

@@ -107,7 +107,7 @@ export default {
       return this.getNoteableData.noteableType === 'MergeRequest';
     },
     iconBgClass() {
-      return ICON_COLORS[this.note.system_note_icon_name] || 'gl-bg-strong gl-text-subtle';
+      return ICON_COLORS[this.note.system_note_icon_name] || 'gl-text-subtle';
     },
     systemNoteIconName() {
       let icon = this.note.system_note_icon_name;
@@ -160,7 +160,7 @@ export default {
         iconBgClass,
         {
           'system-note-icon -gl-mt-1 gl-ml-2 gl-h-6 gl-w-6': isAllowedIcon,
-          'system-note-dot -gl-top-1 gl-ml-4 gl-mt-3 gl-h-3 gl-w-3 gl-border-2 gl-border-solid gl-border-subtle gl-bg-gray-900':
+          'system-note-dot -gl-top-1 gl-ml-4 gl-mt-3 gl-h-3 gl-w-3 gl-border-2 gl-border-solid gl-border-subtle':
             !isAllowedIcon,
         },
       ]"

app/assets/javascripts/work_items/components/notes/system_note.vue

@@ -26,9 +26,9 @@ import { __ } from '~/locale';
 import NoteHeader from '~/notes/components/note_header.vue';
 import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item.vue';
 
-const ALLOWED_ICONS = ['issue-close'];
 const ICON_COLORS = {
-  'issue-close': '!gl-bg-blue-100 gl-text-blue-700 icon-info',
+  'issue-close': 'system-note-icon-info',
+  issues: 'system-note-icon-success',
 };
 
 export default {
@@ -75,7 +75,7 @@ export default {
       return ICON_COLORS[this.note.systemNoteIconName] || '';
     },
     isAllowedIcon() {
-      return ALLOWED_ICONS.includes(this.note.systemNoteIconName);
+      return Object.keys(ICON_COLORS).includes(this.note.systemNoteIconName);
     },
     isTargetNote() {
       return this.targetNoteHash === this.noteAnchorId;
@@ -101,6 +101,13 @@ export default {
     deleteButtonClasses() {
       return this.singleLineDescription ? 'gl-top-5 gl-right-2 gl-mt-2' : 'gl-top-6 gl-right-3';
     },
+    systemNoteIconName() {
+      let icon = this.note.systemNoteIconName;
+      if (this.note.systemNoteIconName === 'issues') {
+        icon = 'issue-open-m';
+      }
+      return icon;
+    },
   },
   mounted() {
     renderGFM(this.$refs['gfm-content']);
@@ -126,13 +133,13 @@ export default {
         getIconColor,
         {
           'system-note-icon -gl-mt-1 gl-ml-2 gl-h-6 gl-w-6': isAllowedIcon,
-          'system-note-dot -gl-top-1 gl-ml-4 gl-mt-3 gl-h-3 gl-w-3 gl-border-2 gl-border-solid gl-border-subtle gl-bg-gray-900':
+          'system-note-dot -gl-top-1 gl-ml-4 gl-mt-3 gl-h-3 gl-w-3 gl-border-2 gl-border-solid gl-border-subtle':
             !isAllowedIcon,
         },
       ]"
       class="gl-relative gl-float-left gl-flex gl-items-center gl-justify-center gl-rounded-full"
     >
-      <gl-icon v-if="isAllowedIcon" :size="14" :name="note.systemNoteIconName" />
+      <gl-icon v-if="isAllowedIcon" :size="14" :name="systemNoteIconName" />
     </div>
     <div class="gl-ml-7">
       <div class="gl-flex gl-items-start gl-justify-between">

app/assets/stylesheets/framework/diffs.scss

@@ -870,18 +870,17 @@ table.code {
   }
 }
 
-.diff-file.linked-file .file-title {
-  background-color: $blue-50;
-  border-color: $blue-200;
-}
+.diff-file.linked-file {
+  border-color: var(--blue-200);
 
-.diff-file.linked-file .diff-content {
-  border-color: $blue-200;
+  .file-title {
+    @apply gl-bg-feedback-info;
+  }
 }
 
 // This is not inside page_bundles because then it won't receive a proper color value for the dark theme
 .diff-file-row.is-active.is-linked {
-  background-color: $blue-50;
+  @apply gl-bg-feedback-info;
 }
 
 .collapsed-file-warning {

app/assets/stylesheets/framework/files.scss

@@ -455,7 +455,7 @@ span.idiff {
     // The virtual scroller has a flat HTML structure so instead of the ::before
     // element stretching over multiple rows we instead create a repeating background image
     // for the line
-    background: repeating-linear-gradient(to right, var(--gray-100, $gray-100), var(--gray-100, $gray-100) 1px, transparent 1px, transparent 14px);
+    background: repeating-linear-gradient(to right, var(--gl-border-color-default), var(--gl-border-color-default) 1px, transparent 1px, transparent 14px);
     background-size: calc(var(--level) * 14px) 100%;
     background-repeat: no-repeat;
     background-position: 14px;

app/assets/stylesheets/page_bundles/merge_requests.scss

@@ -364,11 +364,11 @@
 }
 
 .diff-file-row.is-active {
-  background-color: var(--gray-50, $gray-50);
+  @apply gl-bg-strong;
 }
 
 .diff-file-row.is-loading {
-  color: var(--gl-text-color-disabled);
+  @apply gl-text-disabled;
 }
 
 .mr-info-list {

app/assets/stylesheets/page_bundles/notes/_system_notes.scss

@@ -46,29 +46,32 @@
   }
 }
 
+.system-note-dot {
+  background-color: var(--gl-status-neutral-icon-color);
+}
 
 // Vertical line gradient for specific system note icons
 .system-note-icon {
   color: var(--system-note-icon-color);
   background-color: var(--system-note-icon-background-color);
 
   &.system-note-icon-success {
-    --system-note-icon-color: var(--gl-status-success-text-color);
+    --system-note-icon-color: var(--gl-status-success-icon-color);
     --system-note-icon-background-color: var(--gl-status-success-background-color);
   }
 
   &.system-note-icon-danger {
-    --system-note-icon-color: var(--gl-status-danger-text-color);
+    --system-note-icon-color: var(--gl-status-danger-icon-color);
     --system-note-icon-background-color: var(--gl-status-danger-background-color);
   }
 
   &.system-note-icon-info {
-    --system-note-icon-color: var(--gl-status-info-text-color);
+    --system-note-icon-color: var(--gl-status-info-icon-color);
     --system-note-icon-background-color: var(--gl-status-info-background-color);
   }
 
   &.system-note-icon-warning {
-    --system-note-icon-color: var(--gl-status-warning-text-color);
+    --system-note-icon-color: var(--gl-status-warning-icon-color);
     --system-note-icon-background-color: var(--gl-status-warning-background-color);
   }
 

app/controllers/projects/blob_controller.rb

@@ -46,6 +46,7 @@ class Projects::BlobController < Projects::ApplicationController
   before_action do
     push_frontend_feature_flag(:inline_blame, @project)
     push_frontend_feature_flag(:blob_overflow_menu, current_user)
+    push_frontend_feature_flag(:filter_blob_path, current_user)
     push_frontend_feature_flag(:blob_repository_vue_header_app, @project)
     push_licensed_feature(:file_locks) if @project.licensed_feature_available?(:file_locks)
     push_frontend_feature_flag(:directory_code_dropdown_updates, current_user)

app/controllers/projects/tree_controller.rb

@@ -21,6 +21,7 @@ class Projects::TreeController < Projects::ApplicationController
     push_frontend_feature_flag(:inline_blame, @project)
     push_frontend_feature_flag(:blob_repository_vue_header_app, @project)
     push_frontend_feature_flag(:blob_overflow_menu, current_user)
+    push_frontend_feature_flag(:filter_blob_path, current_user)
     push_licensed_feature(:file_locks) if @project.licensed_feature_available?(:file_locks)
     push_frontend_feature_flag(:directory_code_dropdown_updates, current_user)
   end

app/controllers/projects_controller.rb

@@ -44,6 +44,7 @@ class ProjectsController < Projects::ApplicationController
     push_frontend_feature_flag(:page_specific_styles, current_user)
     push_frontend_feature_flag(:blob_repository_vue_header_app, @project)
     push_frontend_feature_flag(:blob_overflow_menu, current_user)
+    push_frontend_feature_flag(:filter_blob_path, current_user)
     push_licensed_feature(:file_locks) if @project.present? && @project.licensed_feature_available?(:file_locks)
     push_frontend_feature_flag(:directory_code_dropdown_updates, current_user)
 

app/graphql/resolvers/groups_resolver.rb

@@ -32,6 +32,15 @@ class GroupsResolver < BaseResolver
         "for example: `id_desc` or `name_asc`",
       default_value: 'name_asc'
 
+    argument :all_available, GraphQL::Types::Boolean,
+      required: false,
+      default_value: true,
+      replace_null_with_default: true,
+      description: <<~DESC
+        When `true`, returns all accessible groups. When `false`, returns only groups where the user is a member.
+        Unauthenticated requests always return all public groups. The `owned_only` argument takes precedence.
+      DESC
+
     private
 
     def resolve_groups(**args)

app/models/ci/job_token/scope.rb

@@ -36,12 +36,18 @@ def accessible?(accessed_project)
 
       def policies_allowed?(accessed_project, policies)
         return true if self_referential?(accessed_project)
+
+        unless accessed_project.ci_inbound_job_token_scope_enabled?
+          # We capture policies even if the inbound scopes are disabled
+          capture_job_token_policies(policies)
+          return true
+        end
+
         return false unless inbound_accessible?(accessed_project)
 
-        # We capture policies even if the inbound scopes are disabled or the feature flag is disabled
-        Ci::JobToken::Authorization.capture_job_token_policies(policies) if policies.present?
+        # We capture policies even if the feature flag is disabled
+        capture_job_token_policies(policies)
 
-        return true unless accessed_project.ci_inbound_job_token_scope_enabled?
         return true unless Feature.enabled?(:add_policies_to_ci_job_token, accessed_project)
 
         policies_allowed_for_accessed_project?(accessed_project, policies)
@@ -140,6 +146,12 @@ def inbound_allowlist
       def outbound_allowlist
         Ci::JobToken::Allowlist.new(current_project, direction: :outbound)
       end
+
+      def capture_job_token_policies(policies)
+        return if policies.blank?
+
+        Ci::JobToken::Authorization.capture_job_token_policies(policies)
+      end
     end
   end
 end

app/services/merge_requests/base_service.rb

@@ -233,17 +233,14 @@ def create_reviewer_note(merge_request, old_reviewers)
 
     def create_pipeline_for(merge_request, user, async: false, allow_duplicate: false)
       create_pipeline_params = params.slice(:push_options).merge(allow_duplicate: allow_duplicate)
+      service = MergeRequests::CreatePipelineService.new(
+        project: project, current_user: user, params: create_pipeline_params
+      )
 
       if async
-        MergeRequests::CreatePipelineWorker.perform_async(
-          project.id,
-          user.id,
-          merge_request.id,
-          create_pipeline_params.deep_stringify_keys)
+        service.execute_async(merge_request)
       else
-        MergeRequests::CreatePipelineService
-          .new(project: project, current_user: user, params: create_pipeline_params)
-          .execute(merge_request)
+        service.execute(merge_request)
       end
     end
 

app/services/merge_requests/create_pipeline_service.rb

@@ -17,7 +17,7 @@ def execute_async(merge_request)
 
       ::MergeRequests::CreatePipelineWorker.perform_async(
         project.id, current_user.id, merge_request.id,
-        params.merge(pipeline_creation_request: pipeline_creation_request)
+        params.merge(pipeline_creation_request: pipeline_creation_request).deep_stringify_keys
       )
     end