diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-05 20:29:41 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-05 20:29:41 -0800 |
| commit | 8952fc015fae476a20051c01cf4217d82d30c83d (patch) | |
| tree | 07f05c55ff385ce176e148116a04f7abb3a9558a /app/models | |
| parent | c5be267e40c0ba05c2a7de6a71d154f1b5161160 (diff) | |
| download | gitlab-ce-8952fc015fae476a20051c01cf4217d82d30c83d.tar.gz | |
Apply default scope to labels and remove one for notes
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/label.rb | 4 | ||||
| -rw-r--r-- | app/models/note.rb | 1 |
2 files changed, 1 insertions, 4 deletions
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 |