diff options
| author | George Tsiolis <tsiolis.g@gmail.com> | 2018-11-28 21:27:24 +0300 |
|---|---|---|
| committer | George Tsiolis <tsiolis.g@gmail.com> | 2018-11-29 11:44:06 +0300 |
| commit | 7c5643ee12340081abe1a3893a85b219b1fc0dc6 (patch) | |
| tree | ee0b9c12622f95135caea4a97ed86fc50b18a5c4 | |
| parent | e9d0bd8e909d077567b3ce3f9629b1602c731b37 (diff) | |
Move EE only differences for finders
| -rw-r--r-- | app/finders/users_finder.rb | 10 | ||||
| -rw-r--r-- | ee/app/finders/ee/users_finder.rb | 18 | ||||
| -rw-r--r-- | ee/changelogs/unreleased/gt-move-ee-only-differences-for-finders.yml | 5 |
3 files changed, 25 insertions, 8 deletions
diff --git a/app/finders/users_finder.rb b/app/finders/users_finder.rb index f6a16507057..bb51da7a1c0 100644 --- a/app/finders/users_finder.rb +++ b/app/finders/users_finder.rb @@ -14,7 +14,6 @@ # active: boolean # blocked: boolean # external: boolean -# skip_ldap: boolean # class UsersFinder include CreatedAtFilter @@ -38,7 +37,6 @@ class UsersFinder users = by_2fa(users) users = by_created_at(users) users = by_custom_attributes(users) - users = by_non_ldap(users) users end @@ -86,12 +84,6 @@ class UsersFinder end # rubocop: enable CodeReuse/ActiveRecord - def by_non_ldap(users) - return users unless params[:skip_ldap] - - users.non_ldap - end - def by_2fa(users) case params[:two_factor] when 'enabled' @@ -103,3 +95,5 @@ class UsersFinder end end end + +UsersFinder.prepend(EE::UsersFinder) diff --git a/ee/app/finders/ee/users_finder.rb b/ee/app/finders/ee/users_finder.rb new file mode 100644 index 00000000000..c434d792acc --- /dev/null +++ b/ee/app/finders/ee/users_finder.rb @@ -0,0 +1,18 @@ +# frozen_string_literal: true + +module EE + module UsersFinder + extend ::Gitlab::Utils::Override + + override :execute + def execute + by_non_ldap(super) + end + + def by_non_ldap(users) + return users unless params[:skip_ldap] + + users.non_ldap + end + end +end diff --git a/ee/changelogs/unreleased/gt-move-ee-only-differences-for-finders.yml b/ee/changelogs/unreleased/gt-move-ee-only-differences-for-finders.yml new file mode 100644 index 00000000000..814a4ad4e72 --- /dev/null +++ b/ee/changelogs/unreleased/gt-move-ee-only-differences-for-finders.yml @@ -0,0 +1,5 @@ +--- +title: Move EE only differences for finders +merge_request: 8629 +author: George Tsiolis +type: other |