diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /app/finders/container_repositories_finder.rb | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'app/finders/container_repositories_finder.rb')
-rw-r--r-- | app/finders/container_repositories_finder.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/app/finders/container_repositories_finder.rb b/app/finders/container_repositories_finder.rb index 5109efb361b..14e4d6799d8 100644 --- a/app/finders/container_repositories_finder.rb +++ b/app/finders/container_repositories_finder.rb @@ -14,7 +14,8 @@ class ContainerRepositoriesFinder return unless authorized? repositories = @subject.is_a?(Project) ? project_repositories : group_repositories - filter_by_image_name(repositories) + repositories = filter_by_image_name(repositories) + sort(repositories) end private @@ -39,6 +40,12 @@ class ContainerRepositoriesFinder repositories.search_by_name(@params[:name]) end + def sort(repositories) + return repositories unless @params[:sort] + + repositories.order_by(@params[:sort]) + end + def authorized? Ability.allowed?(@user, :read_container_image, @subject) end |