Merge branch 'allow-username-search-to-work-with-at-sign' into 'master'

Allow users to be found by @username

See merge request gitlab-org/gitlab!17742

app/models/user.rb

@@ -444,6 +444,7 @@ class User < ApplicationRecord
     #
     # Returns an ActiveRecord::Relation.
     def search(query)
+      query = query&.delete_prefix('@')
       return none if query.blank?
 
       query = query.downcase

changelogs/unreleased/allow-username-search-to-work-with-at-sign.yml

+---
+title: Allow users to be searched with a @ prefix
+merge_request: 17742
+author:
+type: added

spec/models/user_spec.rb

@@ -1427,10 +1427,18 @@ describe User do
         expect(described_class.search(user.username)).to eq([user, user2])
       end
 
+      it 'returns users with a matching username starting with a @' do
+        expect(described_class.search("@#{user.username}")).to eq([user, user2])
+      end
+
       it 'returns users with a partially matching username' do
         expect(described_class.search(user.username[0..2])).to eq([user, user2])
       end
 
+      it 'returns users with a partially matching username starting with @' do
+        expect(described_class.search("@#{user.username[0..2]}")).to eq([user, user2])
+      end
+
       it 'returns users with a matching username regardless of the casing' do
         expect(described_class.search(user2.username.upcase)).to eq([user2])
       end