From 2cca5745c9fbc6a295c58d3dbea7889bc3074922 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sat, 31 Aug 2013 14:26:01 +0200
Subject: [PATCH] remove deprecated scoped
---
app/models/post.rb | 4 ++--
app/models/profile.rb | 4 ++--
lib/stream/base.rb | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/app/models/post.rb b/app/models/post.rb
index 832a7dbd62..1237e68719 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -85,7 +85,7 @@ class Post < ActiveRecord::Base
def self.excluding_blocks(user)
people = user.blocks.map{|b| b.person_id}
- scope = scoped
+ scope = all
if people.any?
scope = scope.where("posts.author_id NOT IN (?)", people)
@@ -95,7 +95,7 @@ class Post < ActiveRecord::Base
end
def self.excluding_hidden_shareables(user)
- scope = scoped
+ scope = all
if user.has_hidden_shareables_of_type?
scope = scope.where('posts.id NOT IN (?)', user.hidden_shareables["#{self.base_class}"])
end
diff --git a/app/models/profile.rb b/app/models/profile.rb
index 83c6033356..e3e543f29e 100644
--- a/app/models/profile.rb
+++ b/app/models/profile.rb
@@ -144,8 +144,8 @@ class Profile < ActiveRecord::Base
if @tag_string
@tag_string
else
- rows = self.class.connection.select_rows( self.tags.scoped.to_sql )
- rows.inject(""){|string, row| string << "##{row[1]} " }
+ tags = self.tags.pluck(:name)
+ tags.inject(""){|string, tag| string << "##{tag} " }
end
end
diff --git a/lib/stream/base.rb b/lib/stream/base.rb
index 9a00ee173f..77bbbe66a0 100644
--- a/lib/stream/base.rb
+++ b/lib/stream/base.rb
@@ -32,7 +32,7 @@ class Stream::Base
# @return [ActiveRecord::Relation<Post>]
def posts
- Post.scoped
+ Post.all
end
# @return [Array<Post>]
--
GitLab