Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 4 deletions

diff --git a/app/finders/group_members_finder.rb b/app/finders/group_members_finder.rb
index ffa1552627a..bee18017cf3 100644
--- a/app/finders/group_members_finder.rb
+++ b/app/finders/group_members_finder.rb
@@ -1,10 +1,14 @@
 # frozen_string_literal: true
 
 class GroupMembersFinder < UnionFinder
+  include CreatedAtFilter
+
   # Params can be any of the following:
   #   two_factor: string. 'enabled' or 'disabled' are returning different set of data, other values are not effective.
   #   sort:       string
   #   search:     string
+  #   created_after: datetime
+  #   created_before: datetime
 
   def initialize(group, user = nil)
     @group = group
@@ -15,6 +19,7 @@ class GroupMembersFinder < UnionFinder
   def execute(include_relations: [:inherited, :direct], params: {})
     group_members = group.members
     relations = []
+    @params = params
 
     return group_members if include_relations == [:direct]
 
@@ -39,15 +44,15 @@ class GroupMembersFinder < UnionFinder
     return GroupMember.none if relations.empty?
 
     members = find_union(relations, GroupMember)
-    filter_members(members, params)
+    filter_members(members)
   end
   # rubocop: enable CodeReuse/ActiveRecord
 
   private
 
-  attr_reader :user, :group
+  attr_reader :user, :group, :params
 
-  def filter_members(members, params)
+  def filter_members(members)
     members = members.search(params[:search]) if params[:search].present?
     members = members.sort_by_attribute(params[:sort]) if params[:sort].present?
 
@@ -55,7 +60,7 @@ class GroupMembersFinder < UnionFinder
       members = members.filter_by_2fa(params[:two_factor])
     end
 
-    members
+    by_created_at(members)
   end
 
   def can_manage_members