aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2013-06-25 10:01:30 -0700
committerSteve Klabnik <steve@steveklabnik.com>2013-06-25 10:01:30 -0700
commit34d6708be8dab833c25e79d3eaf96dbdf5c5bbfe (patch)
tree0923a0480d099938f7cf40839ca9ee4fe3f1bf5a
parent79abf07be8f623ae803659c38c2692a234cc7831 (diff)
parente84edf13c2984c071e91e747995075bd80b1c194 (diff)
downloadrails-34d6708be8dab833c25e79d3eaf96dbdf5c5bbfe.tar.gz
rails-34d6708be8dab833c25e79d3eaf96dbdf5c5bbfe.tar.bz2
rails-34d6708be8dab833c25e79d3eaf96dbdf5c5bbfe.zip
Merge pull request #11088 from nolman/nolman/scaffold-fix
fix deprecation warning in scaffold controllers
-rw-r--r--railties/lib/rails/generators/active_model.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/active_model.rb b/railties/lib/rails/generators/active_model.rb
index e5373704d7..71104a069c 100644
--- a/railties/lib/rails/generators/active_model.rb
+++ b/railties/lib/rails/generators/active_model.rb
@@ -34,7 +34,7 @@ module Rails
# GET index
def self.all(klass)
- "#{klass}.all"
+ "#{klass}.all.to_a"
end
# GET show