summaryrefslogtreecommitdiff
path: root/app/models/label.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-02-22 16:54:59 -0600
committerDouwe Maan <douwe@selenight.nl>2017-02-23 09:33:19 -0600
commit56de781a2cef437b6e1af748dc0c231af74e044d (patch)
treec8186a283904e3cc7461c4289cd2e1a8a9daa69c /app/models/label.rb
parent1fe7501b49f896b74102c4b970310aa9ae34da85 (diff)
downloadgitlab-ce-56de781a2cef437b6e1af748dc0c231af74e044d.tar.gz
Revert "Enable Style/DotPosition"
This reverts commit e00fb2bdc2090e9cabeb1eb35a2672a882cc96e9. # Conflicts: # .rubocop.yml # .rubocop_todo.yml # lib/gitlab/ci/config/entry/global.rb # lib/gitlab/ci/config/entry/jobs.rb # spec/lib/gitlab/ci/config/entry/factory_spec.rb # spec/lib/gitlab/ci/config/entry/global_spec.rb # spec/lib/gitlab/ci/config/entry/job_spec.rb # spec/lib/gitlab/ci/status/build/factory_spec.rb # spec/lib/gitlab/incoming_email_spec.rb
Diffstat (limited to 'app/models/label.rb')
-rw-r--r--app/models/label.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/label.rb b/app/models/label.rb
index 27429e60e4a..f68a8c9cff2 100644
--- a/app/models/label.rb
+++ b/app/models/label.rb
@@ -34,9 +34,9 @@ class Label < ActiveRecord::Base
scope :with_title, ->(title) { where(title: title) }
def self.prioritized(project)
- joins(:priorities).
- where(label_priorities: { project_id: project }).
- reorder('label_priorities.priority ASC, labels.title ASC')
+ joins(:priorities)
+ .where(label_priorities: { project_id: project })
+ .reorder('label_priorities.priority ASC, labels.title ASC')
end
def self.unprioritized(project)