aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation/spawn_methods.rb
diff options
context:
space:
mode:
authorHenrik Hodne <dvyjones@dvyjones.com>2012-05-20 01:29:13 +0200
committerHenrik Hodne <dvyjones@dvyjones.com>2012-05-20 01:29:13 +0200
commitfa6d921e11363e9b8c4bc10f7aed0b9faffdc33a (patch)
tree1e4fd51d0d58cb5b5f210eeb6842ca3ada999243 /activerecord/lib/active_record/relation/spawn_methods.rb
parent7eb09aed874dbb5f50a9ac0d0dec22e42f6161be (diff)
downloadrails-fa6d921e11363e9b8c4bc10f7aed0b9faffdc33a.tar.gz
rails-fa6d921e11363e9b8c4bc10f7aed0b9faffdc33a.tar.bz2
rails-fa6d921e11363e9b8c4bc10f7aed0b9faffdc33a.zip
Remove blank trailing comments
For future reference, this is the regex I used: ^\s*#\s*\n(?!\s*#). Replace with the first match, and voilĂ ! Note that the regex matches a little bit too much, so you probably want to `git add -i .` and go through every single diff to check if it actually should be changed.
Diffstat (limited to 'activerecord/lib/active_record/relation/spawn_methods.rb')
-rw-r--r--activerecord/lib/active_record/relation/spawn_methods.rb3
1 files changed, 0 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/relation/spawn_methods.rb b/activerecord/lib/active_record/relation/spawn_methods.rb
index 80d087a9ea..4fb1cb6726 100644
--- a/activerecord/lib/active_record/relation/spawn_methods.rb
+++ b/activerecord/lib/active_record/relation/spawn_methods.rb
@@ -23,7 +23,6 @@ module ActiveRecord
# Post.where(:published => true).merge(recent_posts)
# # Returns the intersection of all published posts with the 5 most recently created posts.
# # (This is just an example. You'd probably want to do this with a single query!)
- #
def merge(other)
if other.is_a?(Array)
to_a & other
@@ -45,7 +44,6 @@ module ActiveRecord
#
# Post.order('id asc').except(:order) # discards the order condition
# Post.where('id > 10').order('id asc').except(:where) # discards the where condition but keeps the order
- #
def except(*skips)
result = Relation.new(klass, table, values.except(*skips))
result.default_scoped = default_scoped
@@ -59,7 +57,6 @@ module ActiveRecord
#
# Post.order('id asc').only(:where) # discards the order condition
# Post.order('id asc').only(:where, :order) # uses the specified order
- #
def only(*onlies)
result = Relation.new(klass, table, values.slice(*onlies))
result.default_scoped = default_scoped