Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab-ci.yml

@@ -254,6 +254,10 @@ variables:
   BUILD_ASSETS_IMAGE: "true"  # Set it to "false" to disable assets image building, used in `build-assets-image`
   SIMPLECOV: "true"
 
+  # Temporary variable to enable new CSS compiler
+  # See: https://gitlab.com/gitlab-org/gitlab/-/issues/438278
+  USE_NEW_CSS_PIPELINE: "true"
+
 include:
   - local: .gitlab/ci/_skip.yml
     rules:

app/assets/javascripts/lib/utils/constants.js

@@ -10,9 +10,6 @@ export const BV_SHOW_TOOLTIP = 'bv::show::tooltip';
 export const BV_DROPDOWN_SHOW = 'bv::dropdown::show';
 export const BV_DROPDOWN_HIDE = 'bv::dropdown::hide';
 
-export const DEFAULT_TH_CLASSES =
-  'gl-bg-transparent! gl-border-b-solid! gl-border-b-gray-100! gl-p-5! gl-border-b-1!';
-
 // We set the drawer's z-index to 252 to clear flash messages that might
 // be displayed in the page and that have a z-index of 251.
 export const DRAWER_Z_INDEX = 252;

app/assets/javascripts/lib/utils/table_utility.js

@@ -1,14 +1,4 @@
 import { convertToSnakeCase, convertToCamelCase } from '~/lib/utils/text_utility';
-import { DEFAULT_TH_CLASSES } from './constants';
-
-/**
- * Deprecated: use thWidthPercent instead
- * Generates the table header classes to be used for GlTable fields.
- *
- * @param {Number} width - The column width as a percentage.
- * @returns {String} The classes to be used in GlTable fields object.
- */
-export const thWidthClass = (width) => `gl-w-${width}p ${DEFAULT_TH_CLASSES}`;
 
 /**
  * Generates the table header class for width to be used for GlTable fields.

app/assets/javascripts/organizations/show/components/association_count_card.vue

@@ -1,6 +1,5 @@
 <script>
 import { GlIcon, GlLink, GlCard } from '@gitlab/ui';
-import { numberToMetricPrefix } from '~/lib/utils/number_utils';
 import { __ } from '~/locale';
 
 export default {
@@ -16,7 +15,7 @@ export default {
       required: true,
     },
     count: {
-      type: Number,
+      type: String,
       required: true,
     },
     linkHref: {
@@ -29,11 +28,6 @@ export default {
       default: __('View all'),
     },
   },
-  computed: {
-    formattedCount() {
-      return numberToMetricPrefix(this.count, 0);
-    },
-  },
 };
 </script>
 
@@ -48,7 +42,7 @@ export default {
     </div>
     <span
       class="gl-font-size-h-display gl-font-weight-bold gl-line-height-ratio-1000 gl-mt-2 gl-display-block"
-      >{{ formattedCount }}</span
+      >{{ count }}</span
     >
   </gl-card>
 </template>

app/assets/javascripts/search/sidebar/constants/index.js

@@ -8,6 +8,8 @@ export const SCOPE_NOTES = 'notes';
 export const SCOPE_COMMITS = 'commits';
 export const SCOPE_MILESTONES = 'milestones';
 export const SCOPE_WIKI_BLOBS = 'wiki_blobs';
+export const SCOPE_EPICS = 'epics';
+export const SCOPE_USERS = 'users';
 
 export const LABEL_DEFAULT_CLASSES = [
   'gl-display-flex',

app/assets/javascripts/search/topbar/components/search_type_indicator.vue

@@ -9,6 +9,8 @@ import {
   ADVANCED_SEARCH_TYPE,
   BASIC_SEARCH_TYPE,
   SEARCH_LEVEL_PROJECT,
+  SEARCH_LEVEL_GLOBAL,
+  SEARCH_LEVEL_GROUP,
 } from '~/search/store/constants';
 import {
   ZOEKT_HELP_PAGE,
@@ -17,6 +19,8 @@ import {
   ZOEKT_HELP_PAGE_SYNTAX_ANCHOR,
 } from '../constants';
 
+import { SCOPE_BLOB } from '../../sidebar/constants';
+
 export default {
   name: 'SearchTypeIndicator',
   directives: {
@@ -40,7 +44,7 @@ export default {
     GlLink,
   },
   computed: {
-    ...mapState(['searchType', 'defaultBranchName', 'query', 'searchLevel']),
+    ...mapState(['searchType', 'defaultBranchName', 'query', 'searchLevel', 'query']),
     zoektHelpUrl() {
       return helpPagePath(ZOEKT_HELP_PAGE);
     },
@@ -58,17 +62,39 @@ export default {
       });
     },
     isZoekt() {
-      return this.searchType === ZOEKT_SEARCH_TYPE;
+      return this.searchType === ZOEKT_SEARCH_TYPE && this.query.scope === SCOPE_BLOB;
     },
     isAdvancedSearch() {
-      return this.searchType === ADVANCED_SEARCH_TYPE;
+      return (
+        this.searchType === ADVANCED_SEARCH_TYPE ||
+        (this.searchType === ZOEKT_SEARCH_TYPE && this.query.scope !== SCOPE_BLOB)
+      );
     },
-    isEnabled() {
-      if (this.searchLevel !== SEARCH_LEVEL_PROJECT) {
-        return true;
+    searchTypeTestId() {
+      if (this.isZoekt) {
+        return ZOEKT_SEARCH_TYPE;
+      }
+      if (this.isAdvancedSearch) {
+        return ADVANCED_SEARCH_TYPE;
       }
 
-      return !this.query.repository_ref || this.query.repository_ref === this.defaultBranchName;
+      return BASIC_SEARCH_TYPE;
+    },
+    isEnabled() {
+      const repoRef = this.query.repository_ref;
+      switch (this.searchLevel) {
+        case SEARCH_LEVEL_GLOBAL:
+        case SEARCH_LEVEL_GROUP:
+          return true;
+        case SEARCH_LEVEL_PROJECT: {
+          if (this.query.scope !== SCOPE_BLOB) {
+            return true;
+          }
+          return !repoRef || repoRef === this.defaultBranchName;
+        }
+        default:
+          return false;
+      }
     },
     isBasicSearch() {
       return this.searchType === BASIC_SEARCH_TYPE;
@@ -94,14 +120,14 @@ export default {
 <template>
   <div class="gl-text-gray-600">
     <div v-if="isBasicSearch" data-testid="basic">&nbsp;</div>
-    <div v-else-if="isEnabled" :data-testid="`${searchType}-enabled`">
+    <div v-else-if="isEnabled" :data-testid="`${searchTypeTestId}-enabled`">
       <gl-sprintf :message="enabledMessage">
         <template #link="{ content }">
           <gl-link :href="helpUrl" target="_blank" data-testid="docs-link">{{ content }} </gl-link>
         </template>
       </gl-sprintf>
     </div>
-    <div v-else :data-testid="`${searchType}-disabled`">
+    <div v-else :data-testid="`${searchTypeTestId}-disabled`">
       <gl-sprintf :message="disabledMessage">
         <template #link="{ content }">
           <gl-link :href="helpUrl" target="_blank" data-testid="docs-link">{{ content }} </gl-link>

app/assets/stylesheets/framework/read_more.scss

@@ -21,6 +21,7 @@
     position: relative;
     max-height: var(--read-more-height, #{$fallback - $height});
     scroll-padding-top: 1000vh; // Fix anchor scroll, keep it up top
+    overflow: hidden;
   }
 
   // only appears when size is > $height.

app/graphql/mutations/saved_replies/base.rb

@@ -3,7 +3,7 @@
 module Mutations
   module SavedReplies
     class Base < BaseMutation
-      field :saved_reply, Types::SavedReplyType,
+      field :saved_reply, ::Types::Users::SavedReplyType,
             null: true,
             description: 'Saved reply after mutation.'
 

app/graphql/mutations/saved_replies/destroy.rb

@@ -9,7 +9,7 @@ class Destroy < Base
 
       argument :id, Types::GlobalIDType[::Users::SavedReply],
                required: true,
-               description: copy_field_description(Types::SavedReplyType, :id)
+               description: copy_field_description(::Types::Users::SavedReplyType, :id)
 
       def resolve(id:)
         saved_reply = authorized_find!(id: id)

app/graphql/mutations/saved_replies/update.rb

@@ -9,15 +9,15 @@ class Update < Base
 
       argument :id, Types::GlobalIDType[::Users::SavedReply],
                required: true,
-               description: copy_field_description(Types::SavedReplyType, :id)
+               description: copy_field_description(::Types::Users::SavedReplyType, :id)
 
       argument :name, GraphQL::Types::String,
                required: true,
-               description: copy_field_description(Types::SavedReplyType, :name)
+               description: copy_field_description(::Types::SavedReplyType, :name)
 
       argument :content, GraphQL::Types::String,
                required: true,
-               description: copy_field_description(Types::SavedReplyType, :content)
+               description: copy_field_description(::Types::SavedReplyType, :content)
 
       def resolve(id:, name:, content:)
         saved_reply = authorized_find!(id: id)

app/graphql/resolvers/custom_emoji_resolver.rb

@@ -17,7 +17,7 @@ class CustomEmojiResolver < BaseResolver
     type Types::CustomEmojiType, null: true
 
     def resolve(**args)
-      Groups::CustomEmojiFinder.new(object, args).execute
+      ::Groups::CustomEmojiFinder.new(object, args).execute
     end
   end
 end

app/graphql/resolvers/saved_reply_resolver.rb

@@ -2,7 +2,7 @@
 
 module Resolvers
   class SavedReplyResolver < BaseResolver
-    type Types::SavedReplyType, null: true
+    type ::Types::Users::SavedReplyType, null: true
 
     alias_method :target, :object
 
@@ -11,11 +11,7 @@ class SavedReplyResolver < BaseResolver
       description: 'ID of a saved reply.'
 
     def resolve(id:)
-      saved_reply = ::Users::SavedReply.find_saved_reply(user_id: current_user.id, id: id.model_id)
-
-      return unless saved_reply
-
-      saved_reply
+      ::Users::SavedReply.find_saved_reply(user_id: current_user.id, id: id.model_id)
     end
   end
 end

app/graphql/resolvers/users/groups_resolver.rb

@@ -26,7 +26,7 @@ class GroupsResolver < BaseResolver
       private
 
       def resolve_groups(**args)
-        Groups::UserGroupsFinder.new(current_user, object, args).execute
+        ::Groups::UserGroupsFinder.new(current_user, object, args).execute
       end
     end
   end

app/graphql/types/saved_reply_type.rb

@@ -2,16 +2,10 @@
 
 module Types
   class SavedReplyType < BaseObject
-    graphql_name 'SavedReply'
-
     connection_type_class Types::CountableConnectionType
 
     authorize :read_saved_replies
 
-    field :id, Types::GlobalIDType[::Users::SavedReply],
-           null: false,
-           description: 'Global ID of the saved reply.'
-
     field :content, GraphQL::Types::String,
           null: false,
           description: 'Content of the saved reply.'

app/graphql/types/user_interface.rb

@@ -137,7 +137,7 @@ module UserInterface
           complexity: 5,
           resolver: ::Resolvers::TimelogResolver
     field :saved_replies,
-          Types::SavedReplyType.connection_type,
+          ::Types::Users::SavedReplyType.connection_type,
           null: true,
           description: 'Saved replies authored by the user.'
 

app/graphql/types/users/saved_reply_type.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Types
+  module Users
+    class SavedReplyType < ::Types::SavedReplyType
+      graphql_name 'SavedReply'
+
+      authorize :read_saved_replies
+
+      field :id, Types::GlobalIDType[::Users::SavedReply],
+        null: false,
+        description: 'Global ID of the user saved reply.'
+    end
+  end
+end

app/models/integrations/teamcity.rb

@@ -4,6 +4,7 @@ module Integrations
   class Teamcity < BaseCi
     include PushDataValidations
     include ReactivelyCached
+    include HasAvatar
     prepend EnableSslVerification
 
     TEAMCITY_SAAS_HOSTNAME = /\A[^\.]+\.teamcity\.com\z/i
@@ -91,6 +92,10 @@ def enable_ssl_verification
       original_value.nil? ? (new_record? || url_is_saas?) : original_value
     end
 
+    def attribution_notice
+      'Copyright © 2024 JetBrains s.r.o. JetBrains TeamCity and the JetBrains TeamCity logo are registered trademarks of JetBrains s.r.o.'
+    end
+
     private
 
     def url_is_saas?

app/models/integrations/youtrack.rb

@@ -3,6 +3,7 @@
 module Integrations
   class Youtrack < BaseIssueTracker
     include Integrations::HasIssueTrackerFields
+    include HasAvatar
 
     validates :project_url, :issues_url, presence: true, public_url: true, if: :activated?
 
@@ -15,16 +16,16 @@ def reference_pattern(only_long: false)
     end
 
     def self.title
-      'YouTrack'
+      'JetBrains YouTrack'
     end
 
     def self.description
-      s_("IssueTracker|Use YouTrack as this project's issue tracker.")
+      s_("IssueTracker|Use JetBrains YouTrack as this project's issue tracker.")
     end
 
     def self.help
       docs_link = ActionController::Base.helpers.link_to _('Learn more.'), Rails.application.routes.url_helpers.help_page_url('user/project/integrations/youtrack'), target: '_blank', rel: 'noopener noreferrer'
-      s_("IssueTracker|Use YouTrack as this project's issue tracker. %{docs_link}").html_safe % { docs_link: docs_link.html_safe }
+      s_("IssueTracker|Use JetBrains YouTrack as this project's issue tracker. %{docs_link}").html_safe % { docs_link: docs_link.html_safe }
     end
 
     def self.to_param
@@ -34,5 +35,9 @@ def self.to_param
     def self.fields
       super.select { %w[project_url issues_url].include?(_1.name) }
     end
+
+    def attribution_notice
+      'Copyright © 2024 JetBrains s.r.o. JetBrains YouTrack and the JetBrains YouTrack logo are registered trademarks of JetBrains s.r.o.'
+    end
   end
 end

app/models/note.rb

@@ -652,7 +652,7 @@ def retrieve_upload(_identifier, paths)
   end
 
   def resource_parent
-    project
+    noteable.try(:resource_parent) || project
   end
 
   def user_mentions
@@ -943,4 +943,4 @@ def set_internal_flag
   end
 end
 
-Note.prepend_mod_with('Note')
+Note.prepend_mod

app/services/concerns/work_items/widgetable_service.rb

@@ -66,7 +66,7 @@ def interpret_quick_actions!(work_item, widget_params, attributes = {})
       original_description = description_param.fetch(:description, work_item.description)
 
       description, command_params = QuickActions::InterpretService
-                                      .new(work_item.project, current_user, {})
+                                      .new(container: work_item.resource_parent, current_user: current_user)
                                       .execute(original_description, work_item)
 
       description_param[:description] = description if description && description != original_description

app/services/groups/autocomplete_service.rb

@@ -41,7 +41,7 @@ def labels_as_hash(target)
     def commands(noteable)
       return [] unless noteable
 
-      QuickActions::InterpretService.new(nil, current_user).available_commands(noteable)
+      QuickActions::InterpretService.new(container: group, current_user: current_user).available_commands(noteable)
     end
   end
 end