diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 15:10:58 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 15:10:58 +0000 |
| commit | 049d16d168fdee408b78f5f38619c092fd3b2265 (patch) | |
| tree | 22d1db5ab4fae0967a4da4b1a6b097ef9e5d7aa2 /app/finders/projects_finder.rb | |
| parent | bf18f3295b550c564086efd0a32d9a25435ce216 (diff) | |
| download | gitlab-ce-049d16d168fdee408b78f5f38619c092fd3b2265.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/finders/projects_finder.rb')
| -rw-r--r-- | app/finders/projects_finder.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/app/finders/projects_finder.rb b/app/finders/projects_finder.rb index 6bfe730ebc9..126687ae41f 100644 --- a/app/finders/projects_finder.rb +++ b/app/finders/projects_finder.rb @@ -27,7 +27,6 @@ # last_activity_after: datetime # last_activity_before: datetime # repository_storage: string -# without_deleted: boolean # not_aimed_for_deletion: boolean # class ProjectsFinder < UnionFinder @@ -76,6 +75,7 @@ class ProjectsFinder < UnionFinder # EE would override this to add more filters def filter_projects(collection) + collection = collection.without_deleted collection = by_ids(collection) collection = by_personal(collection) collection = by_starred(collection) @@ -86,7 +86,6 @@ class ProjectsFinder < UnionFinder collection = by_search(collection) collection = by_archived(collection) collection = by_custom_attributes(collection) - collection = by_deleted_status(collection) collection = by_not_aimed_for_deletion(collection) collection = by_last_activity_after(collection) collection = by_last_activity_before(collection) @@ -212,10 +211,6 @@ class ProjectsFinder < UnionFinder items.optionally_search(params[:search], include_namespace: params[:search_namespaces].present?) end - def by_deleted_status(items) - params[:without_deleted].present? ? items.without_deleted : items - end - def by_not_aimed_for_deletion(items) params[:not_aimed_for_deletion].present? ? items.not_aimed_for_deletion : items end |