Add latest changes from gitlab-org/gitlab@master

2 files changed, 53 insertions, 1 deletions

diff --git a/app/finders/groups/accepting_project_shares_finder.rb b/app/finders/groups/accepting_project_shares_finder.rb
new file mode 100644
index 00000000000..c4963fcc352
--- /dev/null
+++ b/app/finders/groups/accepting_project_shares_finder.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+# AcceptingProjectSharesFinder
+#
+# Used to filter Shareable Groups by a set of params
+#
+# Arguments:
+#   current_user - which user is requesting groups
+#   params:
+#     search: string
+module Groups
+  class AcceptingProjectSharesFinder < Base
+    def initialize(current_user, project_to_be_shared, params = {})
+      @current_user = current_user
+      @params = params
+      @project_to_be_shared = project_to_be_shared
+    end
+
+    def execute
+      return Group.none unless can_share_project?
+
+      groups = if has_admin_access?
+                 Group.all
+               else
+                 groups_with_guest_access_plus
+               end
+
+      groups = groups.search(params[:search]) if params[:search].present?
+
+      sort(groups).with_route
+    end
+
+    private
+
+    attr_reader :current_user, :project_to_be_shared, :params
+
+    def has_admin_access?
+      current_user&.can_read_all_resources?
+    end
+
+    # rubocop: disable CodeReuse/Finder
+    def groups_with_guest_access_plus
+      GroupsFinder.new(current_user, min_access_level: Gitlab::Access::GUEST).execute
+    end
+    # rubocop: enable CodeReuse/Finder
+
+    def can_share_project?
+      Ability.allowed?(current_user, :admin_project, project_to_be_shared) &&
+        project_to_be_shared.allowed_to_share_with_group?
+    end
+  end
+end
diff --git a/app/finders/groups/base.rb b/app/finders/groups/base.rb
index d7f56b1a7a6..9d2f9f60a63 100644
--- a/app/finders/groups/base.rb
+++ b/app/finders/groups/base.rb
@@ -5,7 +5,7 @@ module Groups
     private
 
     def sort(items)
-      items.order(Group.arel_table[:path].asc, Group.arel_table[:id].asc) # rubocop: disable CodeReuse/ActiveRecord
+      items.reorder(Group.arel_table[:path].asc, Group.arel_table[:id].asc) # rubocop: disable CodeReuse/ActiveRecord
     end
 
     def by_search(items)