diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/helpers/search_helper.rb | 3 | ||||
| -rw-r--r-- | app/models/project.rb | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 668f946bf0f..3006ff4049d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,7 @@ v 7.4.0 - Improve error reporting on users API (Julien Bianchi) - Refactor test coverage tools usage. Use SIMPLECOV=true to generate it locally - Increase unicorn timeout to 60 seconds + - Sort search autocomplete projects by stars count so most popular go first v 7.3.1 - Fix ref parsing in Gitlab::GitAccess diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index 94e15c0f81c..65b9408cfa1 100644 --- a/app/helpers/search_helper.rb +++ b/app/helpers/search_helper.rb @@ -80,7 +80,8 @@ module SearchHelper # Autocomplete results for the current user's projects def projects_autocomplete(term, limit = 5) - ProjectsFinder.new.execute(current_user).search_by_title(term).non_archived.limit(limit).map do |p| + ProjectsFinder.new.execute(current_user).search_by_title(term). + sorted_by_stars.non_archived.limit(limit).map do |p| { label: "project: #{search_result_sanitize(p.name_with_namespace)}", url: project_path(p) diff --git a/app/models/project.rb b/app/models/project.rb index 7edc15b7782..f9278f19dad 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -122,6 +122,7 @@ class Project < ActiveRecord::Base scope :in_namespace, ->(namespace) { where(namespace_id: namespace.id) } scope :in_group_namespace, -> { joins(:group) } scope :sorted_by_activity, -> { reorder("projects.last_activity_at DESC") } + scope :sorted_by_stars, -> { reorder("projects.star_count DESC") } scope :personal, ->(user) { where(namespace_id: user.namespace_id) } scope :joined, ->(user) { where("namespace_id != ?", user.namespace_id) } scope :public_only, -> { where(visibility_level: Project::PUBLIC) } |