diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2011-12-24 00:51:27 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2011-12-24 00:51:27 +0530 |
| commit | a51c4a314f1721a92864b0484f974bddef894eaa (patch) | |
| tree | a0a489508e6162dfddb23517a404f67e0c71d9de /railties | |
| parent | a805a7fefc09fbc3b8925aae54ea6bd3221dc133 (diff) | |
| parent | 150217f54f625b612f9b03f69f13d09b339d1822 (diff) | |
| download | rails-a51c4a314f1721a92864b0484f974bddef894eaa.tar.gz rails-a51c4a314f1721a92864b0484f974bddef894eaa.tar.bz2 rails-a51c4a314f1721a92864b0484f974bddef894eaa.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
railties/guides/source/active_support_core_extensions.textile
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/README.rdoc | 4 | ||||
| -rw-r--r-- | railties/guides/source/active_record_querying.textile | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/railties/README.rdoc b/railties/README.rdoc index ae40600401..6248b5feed 100644 --- a/railties/README.rdoc +++ b/railties/README.rdoc @@ -21,7 +21,9 @@ Source code can be downloaded as part of the Rails project on GitHub == License -Railties is released under the MIT license. +Railties is released under the MIT license: + +* http://www.opensource.org/licenses/MIT == Support diff --git a/railties/guides/source/active_record_querying.textile b/railties/guides/source/active_record_querying.textile index 0cbabd71a1..beada85ce3 100644 --- a/railties/guides/source/active_record_querying.textile +++ b/railties/guides/source/active_record_querying.textile @@ -966,7 +966,7 @@ When a +lambda+ is used for a +scope+, it can take arguments: <ruby> class Post < ActiveRecord::Base - scope :1_week_before, lambda { |time| where("created_at < ?", time) + scope :1_week_before, lambda { |time| where("created_at < ?", time) } end </ruby> |