From 8952fc015fae476a20051c01cf4217d82d30c83d Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 5 Feb 2015 20:29:41 -0800
Subject: Apply default scope to labels and remove one for notes

---
 app/models/label.rb | 4 +---
 app/models/note.rb  | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'app/models')

diff --git a/app/models/label.rb b/app/models/label.rb
index c8f6a7cd48c..9d7099c5652 100644
--- a/app/models/label.rb
+++ b/app/models/label.rb
@@ -11,8 +11,6 @@
 #
 
 class Label < ActiveRecord::Base
-  include Sortable
-
   DEFAULT_COLOR = '#428BCA'
 
   belongs_to :project
@@ -30,7 +28,7 @@ class Label < ActiveRecord::Base
             format: { with: /\A[^&\?,&]+\z/ },
             uniqueness: { scope: :project_id }
 
-  scope :order_by_name, -> { reorder("labels.title ASC") }
+  default_scope { order(title: :asc) }
 
   alias_attribute :name, :title
 
diff --git a/app/models/note.rb b/app/models/note.rb
index a3f2980cebd..0b988cc3e0f 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -23,7 +23,6 @@ require 'file_size_validator'
 class Note < ActiveRecord::Base
   include Mentionable
 
-  default_scope { order(created_at: :asc, id: :asc) }
   default_value_for :system, false
 
   attr_mentionable :note
-- 
cgit v1.2.1