1 files changed, 4 insertions, 3 deletions
diff --git a/app/models/projects/topic.rb b/app/models/projects/topic.rb
index 78bc2df2e1e..b42b03f0618 100644
--- a/app/models/projects/topic.rb
+++ b/app/models/projects/topic.rb
@@ -7,18 +7,19 @@ module Projects
     include Avatarable
     include Gitlab::SQL::Pattern
 
-    validates :name, presence: true, uniqueness: true, length: { maximum: 255 }
+    validates :name, presence: true, length: { maximum: 255 }
+    validates :name, uniqueness: { case_sensitive: false }, if: :name_changed?
     validates :description, length: { maximum: 1024 }
 
     has_many :project_topics, class_name: 'Projects::ProjectTopic'
     has_many :projects, through: :project_topics
 
-    scope :order_by_total_projects_count, -> { order(total_projects_count: :desc).order(id: :asc) }
+    scope :order_by_non_private_projects_count, -> { order(non_private_projects_count: :desc).order(id: :asc) }
     scope :reorder_by_similarity, -> (search) do
       order_expression = Gitlab::Database::SimilarityScore.build_expression(search: search, rules: [
         { column: arel_table['name'] }
       ])
-      reorder(order_expression.desc, arel_table['total_projects_count'].desc, arel_table['id'])
+      reorder(order_expression.desc, arel_table['non_private_projects_count'].desc, arel_table['id'])
     end
 
     class << self