app/views/users/show.html.haml

@@ -13,7 +13,7 @@
   = auto_discovery_link_tag(:atom, user_url(@user, format: :atom), title: "#{@user.name} activity")
 
 %div{ class: container_class }
-  .user-profile-header.gl-display-flex.gl-justify-content-space-between.gl-flex-direction-column.gl-md-flex-direction-row-reverse.gl-my-5
+  .user-profile-header.gl-display-flex.gl-justify-content-space-between.gl-flex-direction-column.gl-md-flex-direction-row-reverse.gl-my-5{ 'data-testid': 'user-profile-header' }
     %div
       .cover-controls.gl-display-flex.gl-gap-3.gl-mb-4.gl-md-justify-content-end.gl-md-flex-direction-row-reverse
         .js-user-profile-actions{ data: user_profile_actions_data(@user) }

doc/architecture/blueprints/cells/infrastructure/index.md

@@ -38,6 +38,7 @@ status: proposed
   - [Blueprint](deployments.md)
 - `Configuration change`: When we change any configuration on the application or infrastructure. Example: We did a _configuration change_ on labels added to VMs.
 - `Cell`: A single unit, and instance of GitLab. Not used to refer to Dedicated, where an instance of GitLab is called a Tenant.
+- `Ring`: A collection of Cells grouped as single deployment stage target. Example: Cells in Ring 2 will deploy changes after Cells in Ring 1.
 - `Cluster`: A collection of Cells, and the existing GitLab.com infrastructure. Example: We need to change the version of Registry in the Cluster.
 - `Fleet`: The collection of all SaaS environments, both single-tenant and multi-tenant, that collectively form our production environments.
   This includes existing GitLab.com infrastructure, Cells, and Dedicated.

lib/gitlab/bitbucket_import/importers/issue_importer.rb

@@ -11,16 +11,13 @@ def initialize(project, hash)
           @project = project
           @formatter = Gitlab::ImportFormatter.new
           @user_finder = UserFinder.new(project)
+          @mentions_converter = Gitlab::Import::MentionsConverter.new('bitbucket', project)
           @object = hash.with_indifferent_access
         end
 
         def execute
           log_info(import_stage: 'import_issue', message: 'starting', iid: object[:iid])
 
-          description = ''
-          description += author_line
-          description += object[:description] if object[:description]
-
           milestone = object[:milestone] ? project.milestones.find_or_create_by(title: object[:milestone]) : nil # rubocop: disable CodeReuse/ActiveRecord
 
           attributes = {
@@ -49,7 +46,15 @@ def execute
 
         private
 
-        attr_reader :object, :project, :formatter, :user_finder
+        attr_reader :object, :project, :formatter, :user_finder, :mentions_converter
+
+        def description
+          description = ''
+          description += author_line
+          description += object[:description] if object[:description]
+
+          mentions_converter.convert(description)
+        end
 
         def author_line
           return '' if find_user_id

lib/gitlab/bitbucket_import/importers/issue_notes_importer.rb

@@ -11,6 +11,7 @@ def initialize(project, hash)
           @formatter = Gitlab::ImportFormatter.new
           @user_finder = UserFinder.new(project)
           @ref_converter = Gitlab::BitbucketImport::RefConverter.new(project)
+          @mentions_converter = Gitlab::Import::MentionsConverter.new('bitbucket', project)
           @object = hash.with_indifferent_access
         end
 
@@ -23,13 +24,9 @@ def execute
             client.issue_comments(project.import_source, issue.iid).each do |comment|
               next unless comment.note.present?
 
-              note = ''
-              note += formatter.author_line(comment.author) unless user_finder.find_user_id(comment.author)
-              note += ref_converter.convert_note(comment.note)
-
               issue.notes.create!(
                 project: project,
-                note: note,
+                note: comment_note(comment),
                 author_id: user_finder.gitlab_user_id(project, comment.author),
                 created_at: comment.created_at,
                 updated_at: comment.updated_at
@@ -44,7 +41,15 @@ def execute
 
         private
 
-        attr_reader :object, :project, :formatter, :user_finder, :ref_converter
+        attr_reader :object, :project, :formatter, :user_finder, :ref_converter, :mentions_converter
+
+        def comment_note(comment)
+          note = ''
+          note += formatter.author_line(comment.author) unless user_finder.find_user_id(comment.author)
+          note += ref_converter.convert_note(comment.note)
+
+          mentions_converter.convert(note)
+        end
       end
     end
   end

lib/gitlab/bitbucket_import/importers/pull_request_importer.rb

@@ -11,6 +11,7 @@ def initialize(project, hash)
           @project = project
           @formatter = Gitlab::ImportFormatter.new
           @user_finder = UserFinder.new(project)
+          @mentions_converter = Gitlab::Import::MentionsConverter.new('bitbucket', project)
           @object = hash.with_indifferent_access
         end
 
@@ -19,10 +20,6 @@ def execute
 
           log_info(import_stage: 'import_pull_request', message: 'starting', iid: object[:iid])
 
-          description = ''
-          description += author_line
-          description += object[:description] if object[:description]
-
           attributes = {
             iid: object[:iid],
             title: object[:title],
@@ -58,7 +55,7 @@ def execute
 
         private
 
-        attr_reader :object, :project, :formatter, :user_finder
+        attr_reader :object, :project, :formatter, :user_finder, :mentions_converter
 
         def skip
           return false unless object[:source_and_target_project_different]
@@ -69,6 +66,14 @@ def skip
           true
         end
 
+        def description
+          description = ''
+          description += author_line
+          description += object[:description] if object[:description]
+
+          mentions_converter.convert(description)
+        end
+
         def author_line
           return '' if find_user_id
 

lib/gitlab/bitbucket_import/importers/pull_request_notes_importer.rb

@@ -11,6 +11,7 @@ def initialize(project, hash)
           @formatter = Gitlab::ImportFormatter.new
           @user_finder = UserFinder.new(project)
           @ref_converter = Gitlab::BitbucketImport::RefConverter.new(project)
+          @mentions_converter = Gitlab::Import::MentionsConverter.new('bitbucket', project)
           @object = hash.with_indifferent_access
           @position_map = {}
           @discussion_map = {}
@@ -28,7 +29,8 @@ def execute
 
         private
 
-        attr_reader :object, :project, :formatter, :user_finder, :ref_converter, :discussion_map, :position_map
+        attr_reader :object, :project, :formatter, :user_finder, :ref_converter, :mentions_converter,
+          :discussion_map, :position_map
 
         def import_pull_request_comments
           inline_comments, pr_comments = comments.partition(&:inline?)
@@ -128,7 +130,8 @@ def pull_request_comment_attributes(comment)
 
         def comment_note(comment)
           author = formatter.author_line(comment.author) unless user_finder.find_user_id(comment.author)
-          author.to_s + ref_converter.convert_note(comment.note.to_s)
+          note = author.to_s + ref_converter.convert_note(comment.note.to_s)
+          mentions_converter.convert(note)
         end
 
         def merge_request

lib/gitlab/bitbucket_import/importers/users_importer.rb

@@ -45,7 +45,12 @@ def execute
         private
 
         def cache_users(users)
-          # No-op for now
+          users_hash = users.each_with_object({}) do |user, hash|
+            cache_key = source_user_cache_key('bitbucket', project_id, "{#{user.account_id}}")
+            hash[cache_key] = source_user_cache_value(user.nickname || user.name, type: :name)
+          end
+
+          cache_multiple(users_hash)
         end
 
         def client

lib/gitlab/bitbucket_server_import/importers/pull_request_importer.rb

@@ -10,7 +10,7 @@ def initialize(project, hash)
           @project = project
           @formatter = Gitlab::ImportFormatter.new
           @user_finder = UserFinder.new(project)
-          @mentions_converter = Gitlab::Import::MentionsConverter.new('bitbucket_server', project.id)
+          @mentions_converter = Gitlab::Import::MentionsConverter.new('bitbucket_server', project)
 
           # Object should behave as a object so we can remove object.is_a?(Hash) check
           # This will be fixed in https://gitlab.com/gitlab-org/gitlab/-/issues/412328

lib/gitlab/bitbucket_server_import/importers/pull_request_notes_importer.rb

@@ -11,7 +11,7 @@ def initialize(project, hash)
           @project = project
           @user_finder = UserFinder.new(project)
           @formatter = Gitlab::ImportFormatter.new
-          @mentions_converter = Gitlab::Import::MentionsConverter.new('bitbucket_server', project.id)
+          @mentions_converter = Gitlab::Import::MentionsConverter.new('bitbucket_server', project)
           @object = hash.with_indifferent_access
         end
 

lib/gitlab/bitbucket_server_import/importers/users_importer.rb

@@ -47,7 +47,7 @@ def execute
         def cache_users(users)
           users_hash = users.each_with_object({}) do |user, hash|
             cache_key = source_user_cache_key('bitbucket_server', project_id, user.username)
-            hash[cache_key] = user.email
+            hash[cache_key] = source_user_cache_value(user.email, type: :email)
           end
 
           cache_multiple(users_hash)

lib/gitlab/import/mentions_converter.rb

@@ -5,14 +5,18 @@ module Import
     class MentionsConverter
       include UserFromMention
 
-      MENTIONS_REGEX = User.reference_pattern
+      # Captures anything in brackets after an @ but does not capture the @. It allows mentions
+      # like @{1111:11-11} to be captured even though it doesn't match User.reference_pattern
+      BITBUCKET_MENTIONS_REGEX = /(?<=@)(\{.+?\})/
+      GITLAB_MENTIONS_REGEX = User.reference_pattern
       MENTION_PLACEHOLDER = '~GITLAB_MENTION_PLACEHOLDER~'
 
-      attr_reader :importer, :project_id
+      attr_reader :importer, :project_id, :project_creator
 
-      def initialize(importer, project_id)
+      def initialize(importer, project)
         @importer = importer
-        @project_id = project_id
+        @project_id = project.id
+        @project_creator = project.creator
       end
 
       def convert(text)
@@ -22,26 +26,37 @@ def convert(text)
       private
 
       def replace_mentions(text)
-        mentions = text.scan(MENTIONS_REGEX).flatten
+        mentions = pluck_mentions_from_text(text)
         altered_mentions = []
 
         mentions.each do |mention|
           user = user_from_cache(mention)
-
-          if user
-            altered_mentions << ["@#{mention}", "#{MENTION_PLACEHOLDER}#{user.username}"]
-            next
+          replacement_mention =
+            if user.is_a?(User)
+              "#{MENTION_PLACEHOLDER}#{user.username}"
+            elsif user
+              "`#{MENTION_PLACEHOLDER}#{user}`"
+            else
+              "`#{MENTION_PLACEHOLDER}#{mention}`"
             end
 
-          altered_mentions << ["@#{mention}", "`#{MENTION_PLACEHOLDER}#{mention}`"]
+          altered_mentions << [mention, replacement_mention]
         end
 
         altered_mentions.each do |original_mention, altered_mention|
-          text.sub!(original_mention, altered_mention)
+          text.sub!("@#{original_mention}", altered_mention)
         end
 
         text.gsub(MENTION_PLACEHOLDER, '@')
       end
+
+      def pluck_mentions_from_text(text)
+        gitlab_like_mentions = text.scan(GITLAB_MENTIONS_REGEX)
+
+        return gitlab_like_mentions unless Feature.enabled?(:bitbucket_cloud_convert_mentions_to_users, project_creator)
+
+        (gitlab_like_mentions + text.scan(BITBUCKET_MENTIONS_REGEX)).flatten
+      end
     end
   end
 end

lib/gitlab/import/user_from_mention.rb

@@ -3,28 +3,44 @@
 module Gitlab
   module Import
     module UserFromMention
-      SOURCE_USER_CACHE_KEY = '%s/project/%s/source/username/%s'
+      SOURCE_USER_CACHE_KEY = '%s/project/%s/source/%s'
+      SOURCE_USERNAME_CACHE_KEY = '%s/project/%s/source/username/%s'
+
+      USER_MAPPABLE_TYPES = [
+        :email
+      ].freeze
 
       def user_from_cache(mention)
-        cached_email = read(mention)
+        cached_user_value_hash = read(mention)
+        cached_user_value_hash ||= read_cached_email(mention)
 
-        return unless cached_email
+        return unless cached_user_value_hash
+
+        mapping_type = cached_user_value_hash['type']
+        user_value = cached_user_value_hash['value']
+        return user_value if USER_MAPPABLE_TYPES.exclude?(mapping_type.to_sym)
 
-        find_user(cached_email)
+        find_user(user_value)
       end
 
       def cache_multiple(hash)
         ::Gitlab::Cache::Import::Caching.write_multiple(hash, timeout: timeout)
       end
 
-      def source_user_cache_key(importer, project_id, username)
-        format(SOURCE_USER_CACHE_KEY, importer, project_id, username)
+      def source_user_cache_key(importer, project_id, source_key)
+        format(SOURCE_USER_CACHE_KEY, importer, project_id, source_key)
+      end
+
+      def source_user_cache_value(source_value, type:)
+        { value: source_value, type: type }.to_json
       end
 
       private
 
       def read(mention)
+        Gitlab::Json.parse(
           ::Gitlab::Cache::Import::Caching.read(source_user_cache_key(importer, project_id, mention))
+        )
       end
 
       def find_user(email)
@@ -34,6 +50,17 @@ def find_user(email)
       def timeout
         ::Gitlab::Cache::Import::Caching::LONGER_TIMEOUT
       end
+
+      def read_cached_email(mention)
+        # Attempt to find a cached email in case a user email was cached before changes to the cache structure were
+        # merged but before the cached email could be read and mapped in the import
+        source_username_cache_key = format(SOURCE_USERNAME_CACHE_KEY, importer, project_id, mention)
+        cached_email = ::Gitlab::Cache::Import::Caching.read(source_username_cache_key)
+
+        return unless cached_email
+
+        { value: cached_email, type: :email }.with_indifferent_access
+      end
     end
   end
 end

qa/gdk/Dockerfile.gdk

-ARG GDK_SHA=abddfc08e2139bbfb319099ef5e54b3852369c64
+ARG GDK_SHA=83323a21f442daf9a46b3ed6222c84c3fd086792
 # Use tag prefix when running on 'stable' branch to make sure 'protected' image is used which is not deleted by registry cleanup
 ARG GDK_BASE_TAG_PREFIX
 

spec/features/profiles/account_spec.rb

@@ -51,14 +51,14 @@
       update_username(new_username)
       visit new_user_path
       expect(page).to have_current_path(new_user_path, ignore_query: true)
-      expect(find('.user-profile-header')).to have_content(new_username)
+      expect(find_by_testid('user-profile-header')).to have_content(new_username)
     end
 
     it 'the old user path redirects to the new path' do
       update_username(new_username)
       visit old_user_path
       expect(page).to have_current_path(new_user_path, ignore_query: true)
-      expect(find('.user-profile-header')).to have_content(new_username)
+      expect(find_by_testid('user-profile-header')).to have_content(new_username)
     end
 
     context 'with a project' do

spec/features/profiles/user_visits_profile_spec.rb

@@ -48,7 +48,7 @@
       it 'shows expected content', :js do
         visit(user_path(user))
 
-        page.within ".user-profile-header" do
+        within_testid('user-profile-header') do
           expect(page).to have_content user.name
           expect(page).to have_content user.username
         end

spec/features/users/rss_spec.rb

@@ -13,7 +13,7 @@
     end
 
     it 'shows the RSS link with overflow menu', :js do
-      page.within('.user-profile-header') do
+      within_testid('user-profile-header') do
         find_by_testid('base-dropdown-toggle').click
       end
 
@@ -27,7 +27,7 @@
     end
 
     it 'has an RSS without a feed token', :js do
-      page.within('.user-profile-header') do
+      within_testid('user-profile-header') do
         find_by_testid('base-dropdown-toggle').click
       end
 

spec/features/users/show_spec.rb

@@ -309,7 +309,7 @@
     end
 
     it 'shows user name as blocked' do
-      expect(page).to have_css(".user-profile-header", text: 'Blocked user')
+      expect(page).to have_css('[data-testid="user-profile-header"]', text: 'Blocked user')
     end
 
     it 'shows no additional fields' do
@@ -347,11 +347,11 @@
       end
 
       it 'shows user name as unconfirmed' do
-        expect(page).to have_css(".user-profile-header", text: 'Unconfirmed user')
+        expect(page).to have_css('[data-testid="user-profile-header"]', text: 'Unconfirmed user')
       end
 
       it 'shows no tab' do
-        expect(page).to have_css("div.profile-header")
+        expect(page).to have_css('[data-testid="user-profile-header"]')
         expect(page).not_to have_css("ul.nav-links")
       end
 

spec/lib/gitlab/bitbucket_import/importers/issue_importer_spec.rb

@@ -10,6 +10,7 @@
   let_it_be(:identity) { create(:identity, user: bitbucket_user, extern_uid: 'bitbucket_user', provider: :bitbucket) }
   let_it_be(:default_work_item_type) { create(:work_item_type) }
   let_it_be(:label) { create(:label, project: project) }
+  let(:mentions_converter) { Gitlab::Import::MentionsConverter.new('bitbucket', project) }
 
   let(:hash) do
     {
@@ -30,6 +31,7 @@
 
   before do
     allow(Gitlab::Git).to receive(:ref_name).and_return('refname')
+    allow(Gitlab::Import::MentionsConverter).to receive(:new).and_return(mentions_converter)
   end
 
   describe '#execute' do
@@ -48,6 +50,12 @@
       expect(issue.updated_at).to eq(Date.today)
     end
 
+    it 'converts mentions in the description' do
+      expect(mentions_converter).to receive(:convert).once.and_call_original
+
+      importer.execute
+    end
+
     context 'when the author does not have a bitbucket identity' do
       before do
         identity.update!(provider: :github)

spec/lib/gitlab/bitbucket_import/importers/issue_notes_importer_spec.rb

@@ -17,6 +17,7 @@
   let(:hash) { { iid: issue.iid } }
   let(:note_body) { 'body' }
   let(:client) { Bitbucket::Client.new({}) }
+  let(:mentions_converter) { Gitlab::Import::MentionsConverter.new('bitbucket', project) }
 
   subject(:importer) { described_class.new(project, hash) }
 
@@ -35,6 +36,7 @@
     before do
       allow(Bitbucket::Client).to receive(:new).and_return(client)
       allow(client).to receive(:issue_comments).and_return(issue_comments_response)
+      allow(Gitlab::Import::MentionsConverter).to receive(:new).and_return(mentions_converter)
     end
 
     it 'creates a new note with the correct attributes' do
@@ -49,6 +51,12 @@
       expect(note.updated_at).to eq(Date.today)
     end
 
+    it 'converts mentions in the note' do
+      expect(mentions_converter).to receive(:convert).once.and_call_original
+
+      importer.execute
+    end
+
     context 'when the author does not have a bitbucket identity' do
       before do
         identity.update!(provider: :github)

spec/lib/gitlab/bitbucket_import/importers/pull_request_importer_spec.rb

@@ -11,6 +11,7 @@
   let_it_be(:user_3) { create(:user) }
   let_it_be(:identity) { create(:identity, user: bitbucket_user, extern_uid: 'bitbucket_user', provider: :bitbucket) }
   let_it_be(:identity_2) { create(:identity, user: user_2, extern_uid: 'user_2', provider: :bitbucket) }
+  let(:mentions_converter) { Gitlab::Import::MentionsConverter.new('bitbucket', project) }
   let(:source_branch_sha) { project.repository.commit.sha }
   let(:target_branch_sha) { project.repository.commit('refs/heads/master').sha }
 
@@ -33,6 +34,10 @@
 
   subject(:importer) { described_class.new(project, hash) }
 
+  before do
+    allow(Gitlab::Import::MentionsConverter).to receive(:new).and_return(mentions_converter)
+  end
+
   describe '#execute' do
     it 'calls MergeRequestCreator' do
       expect(Gitlab::Import::MergeRequestCreator).to receive_message_chain(:new, :execute)
@@ -61,6 +66,12 @@
       expect(merge_request.merge_request_diffs.first.head_commit_sha).to eq(target_branch_sha)
     end
 
+    it 'converts mentions in the description' do
+      expect(mentions_converter).to receive(:convert).once.and_call_original
+
+      importer.execute
+    end
+
     context 'when the state is closed' do
       it 'marks merge request as closed' do
         described_class.new(project, hash.merge(state: 'closed')).execute