Merge branch 'weimeng-user-autocomplete-fix' into 'master'

Only show author in autocomplete dropdown if author is active

See merge request gitlab-org/gitlab-ce!27292

3 files changed, 26 insertions, 5 deletions

diff --git a/app/finders/autocomplete/users_finder.rb b/app/finders/autocomplete/users_finder.rb
index 45955783be9..ce7d0b8699c 100644
--- a/app/finders/autocomplete/users_finder.rb
+++ b/app/finders/autocomplete/users_finder.rb
@@ -2,6 +2,8 @@
 
 module Autocomplete
   class UsersFinder
+    include Gitlab::Utils::StrongMemoize
+
     # The number of users to display in the results is hardcoded to 20, and
     # pagination is not supported. This ensures that performance remains
     # consistent and removes the need for implementing keyset pagination to
@@ -31,7 +33,7 @@ module Autocomplete
         # Include current user if available to filter by "Me"
         items.unshift(current_user) if prepend_current_user?
 
-        if prepend_author? && (author = User.find_by_id(author_id))
+        if prepend_author? && author&.active?
           items.unshift(author)
         end
       end
@@ -41,6 +43,12 @@ module Autocomplete
 
     private
 
+    def author
+      strong_memoize(:author) do
+        User.find_by_id(author_id)
+      end
+    end
+
     # Returns the users based on the input parameters, as an Array.
     #
     # This method is separate so it is easier to extend in EE.
diff --git a/changelogs/unreleased/weimeng-user-autocomplete-fix.yml b/changelogs/unreleased/weimeng-user-autocomplete-fix.yml
new file mode 100644
index 00000000000..aca9fc4be30
--- /dev/null
+++ b/changelogs/unreleased/weimeng-user-autocomplete-fix.yml
@@ -0,0 +1,5 @@
+---
+title: Only show in autocomplete when author active
+merge_request: 27292
+author:
+type: fixed
diff --git a/spec/finders/autocomplete/users_finder_spec.rb b/spec/finders/autocomplete/users_finder_spec.rb
index abd0d6b5185..bcde115b1a6 100644
--- a/spec/finders/autocomplete/users_finder_spec.rb
+++ b/spec/finders/autocomplete/users_finder_spec.rb
@@ -26,9 +26,17 @@ describe Autocomplete::UsersFinder do
       it { is_expected.to match_array([project.owner]) }
 
       context 'when author_id passed' do
-        let(:params) { { author_id: user2.id } }
+        context 'and author is active' do
+          let(:params) { { author_id: user1.id } }
 
-        it { is_expected.to match_array([project.owner, user2]) }
+          it { is_expected.to match_array([project.owner, user1]) }
+        end
+
+        context 'and author is blocked' do
+          let(:params) { { author_id: user2.id } }
+
+          it { is_expected.to match_array([project.owner]) }
+        end
       end
     end
 
@@ -104,9 +112,9 @@ describe Autocomplete::UsersFinder do
     end
 
     context 'when filtered by author_id' do
-      let(:params) { { author_id: user2.id } }
+      let(:params) { { author_id: user1.id } }
 
-      it { is_expected.to match_array([user2, user1, external_user, omniauth_user, current_user]) }
+      it { is_expected.to match_array([user1, external_user, omniauth_user, current_user]) }
     end
   end
 end