diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 8872cf59a2cfa17fed8f461dc7e9037090911082..645b35ec660506107683f23186c626c277b25ac9 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -19,12 +19,12 @@ module Issuable
validates :title, presence: true, length: { within: 0..255 }
validates :closed, inclusion: { in: [true, false] }
- scope :opened, where(closed: false)
- scope :closed, where(closed: true)
+ scope :opened, -> { where(closed: false) }
+ scope :closed, -> { where(closed: true) }
scope :of_group, ->(group) { where(project_id: group.project_ids) }
scope :of_user_team, ->(team) { where(project_id: team.project_ids, assignee_id: team.member_ids) }
scope :assigned, ->(u) { where(assignee_id: u.id)}
- scope :recent, order("created_at DESC")
+ scope :recent, -> { order("created_at DESC") }
delegate :name,
:email,
diff --git a/app/models/event.rb b/app/models/event.rb
index d0ba61544d1157af3595a5e9339ae45eee0f5928..97b1e3306aa95ee08632c2b95e11cb498f1576fc 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -42,8 +42,8 @@ class Event < ActiveRecord::Base
serialize :data
# Scopes
- scope :recent, order("created_at DESC")
- scope :code_push, where(action: Pushed)
+ scope :recent, -> { order("created_at DESC") }
+ scope :code_push, -> { where(action: Pushed) }
scope :in_projects, ->(project_ids) { where(project_id: project_ids).recent }
class << self
diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index 8b4c895dc17c288a45ed93a8c6236862a1ff4e17..457fe18f35b9fb689e3fc27b3a0b5c7002745a71 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -20,8 +20,8 @@ class Milestone < ActiveRecord::Base
has_many :issues
has_many :merge_requests
- scope :active, where(closed: false)
- scope :closed, where(closed: true)
+ scope :active, -> { where(closed: false) }
+ scope :closed, -> { where(closed: true) }
validates :title, presence: true
validates :project, presence: true
diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index 547d383d911f34a8d13e18d96edb1aeb164d0a99..4e157839369bdab3ff6c41ce013e195aeb704ce6 100644
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -29,7 +29,7 @@ class Namespace < ActiveRecord::Base
after_update :move_dir
after_destroy :rm_dir
- scope :root, where('type IS NULL')
+ scope :root, -> { where('type IS NULL') }
def self.search query
where("name LIKE :query OR path LIKE :query", query: "%#{query}%")
diff --git a/app/models/note.rb b/app/models/note.rb
index ded126b4bf1c6591c99501e606443fa0a00df3b5..97f6bf6e3a73f6a273bca4572c67c49be75ba90e 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -43,8 +43,8 @@ class Note < ActiveRecord::Base
# Scopes
scope :for_commit_id, ->(commit_id) { where(noteable_type: "Commit", commit_id: commit_id) }
- scope :inline, where("line_code IS NOT NULL")
- scope :not_inline, where("line_code IS NULL")
+ scope :inline, -> { where("line_code IS NOT NULL") }
+ scope :not_inline, -> { where("line_code IS NULL") }
scope :common, ->{ where(noteable_type: ["", nil]) }
scope :fresh, ->{ order("created_at ASC, id ASC") }
diff --git a/app/models/project.rb b/app/models/project.rb
index 8c747743813c42bfae3b73a4a27c46a716f20086..c1e04899f65184a5e63035e449dfdb2467fc30a9 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -91,7 +91,7 @@ class Project < ActiveRecord::Base
scope :sorted_by_activity, ->() { order("(SELECT max(events.created_at) FROM events WHERE events.project_id = projects.id) DESC") }
scope :personal, ->(user) { where(namespace_id: user.namespace_id) }
scope :joined, ->(user) { where("namespace_id != ?", user.namespace_id) }
- scope :public, where(public: true)
+ scope :public, -> { where(public: true) }
class << self
def abandoned
diff --git a/app/models/snippet.rb b/app/models/snippet.rb
index 806d346cf1084d0e4c3f2d96894ee62c084b1de2..c4ee35e055696f1df901ae5a27364b2386b8c077 100644
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
@@ -31,9 +31,9 @@ class Snippet < ActiveRecord::Base
validates :content, presence: true
# Scopes
- scope :fresh, order("created_at DESC")
- scope :non_expired, where(["expires_at IS NULL OR expires_at > ?", Time.current])
- scope :expired, where(["expires_at IS NOT NULL AND expires_at < ?", Time.current])
+ scope :fresh, -> { order("created_at DESC") }
+ scope :non_expired, -> { where(["expires_at IS NULL OR expires_at > ?", Time.current]) }
+ scope :expired, -> { where(["expires_at IS NOT NULL AND expires_at < ?", Time.current]) }
def self.content_types
[
diff --git a/app/models/user.rb b/app/models/user.rb
index 5b0df09a439780bbcc90ae731ffabb3e8af6bac6..8c1a8b42b672d775c18c0019962a89f1c01630b1 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -87,10 +87,10 @@ class User < ActiveRecord::Base
delegate :path, to: :namespace, allow_nil: true, prefix: true
# Scopes
- scope :admins, where(admin: true)
- scope :blocked, where(blocked: true)
- scope :active, where(blocked: false)
- scope :alphabetically, order('name ASC')
+ scope :admins, -> { where(admin: true) }
+ scope :blocked, -> { where(blocked: true) }
+ scope :active, -> { where(blocked: false) }
+ scope :alphabetically, -> { order('name ASC') }
scope :in_team, ->(team){ where(id: team.member_ids) }
scope :not_in_team, ->(team){ where('users.id NOT IN (:ids)', ids: team.member_ids) }
scope :potential_team_members, ->(team) { team.members.any? ? active.not_in_team(team) : active }
diff --git a/app/models/users_project.rb b/app/models/users_project.rb
index dd8ceb9da70e51ef7a16c548530948435c665d92..486aaa6966a4ded3168c4d6c8953064f4d10416c 100644
--- a/app/models/users_project.rb
+++ b/app/models/users_project.rb
@@ -32,10 +32,10 @@ class UsersProject < ActiveRecord::Base
delegate :name, :username, :email, to: :user, prefix: true
- scope :guests, where(project_access: GUEST)
- scope :reporters, where(project_access: REPORTER)
- scope :developers, where(project_access: DEVELOPER)
- scope :masters, where(project_access: MASTER)
+ scope :guests, -> { where(project_access: GUEST) }
+ scope :reporters, -> { where(project_access: REPORTER) }
+ scope :developers, -> { where(project_access: DEVELOPER) }
+ scope :masters, -> { where(project_access: MASTER) }
scope :in_project, ->(project) { where(project_id: project.id) }
scope :in_projects, ->(projects) { where(project_id: project_ids) }
diff --git a/spec/factories.rb b/spec/factories.rb
index 0e0c04f98751ef17db30e5dd1d88b8a64f6b400b..ae9066cb30c0b1f27f028fec0792a5e2ef812215 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -123,7 +123,7 @@ FactoryGirl.define do
factory :event do
factory :closed_issue_event do
project
- action Event::Closed
+ action { Event::Closed }
target factory: :closed_issue
author factory: :user
end