diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-12-29 00:19:51 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-12-29 00:19:51 +0530 |
| commit | 427544ed45ff8dccc4c94065ce243806189b282e (patch) | |
| tree | 1c811ab1acfaed2ab902bf8e57d9a12f60d49cb6 | |
| parent | 90397de416bb4d9d852a1baa65f954c81bf9911a (diff) | |
| parent | 896a04971be6ec0df7df70545ee85e7978d3e41a (diff) | |
| download | rails-427544ed45ff8dccc4c94065ce243806189b282e.tar.gz rails-427544ed45ff8dccc4c94065ce243806189b282e.tar.bz2 rails-427544ed45ff8dccc4c94065ce243806189b282e.zip | |
Merge branch 'master' of github.com:lifo/docrails
| -rw-r--r-- | guides/source/active_record_validations.md | 4 | ||||
| -rw-r--r-- | guides/source/active_support_instrumentation.md | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/guides/source/active_record_validations.md b/guides/source/active_record_validations.md index 822d12aa3a..5797c93ae7 100644 --- a/guides/source/active_record_validations.md +++ b/guides/source/active_record_validations.md @@ -656,8 +656,6 @@ class Coffee < ActiveRecord::Base end ``` -TIP: `:allow_nil` is ignored by the presence validator. - ### `:allow_blank` The `:allow_blank` option is similar to the `:allow_nil` option. This option @@ -673,8 +671,6 @@ Topic.create("title" => "").valid? # => true Topic.create("title" => nil).valid? # => true ``` -TIP: `:allow_blank` is ignored by the presence validator. - ### `:message` As you've already seen, the `:message` option lets you specify the message that diff --git a/guides/source/active_support_instrumentation.md b/guides/source/active_support_instrumentation.md index cf5a51fc5b..6b3be69942 100644 --- a/guides/source/active_support_instrumentation.md +++ b/guides/source/active_support_instrumentation.md @@ -432,7 +432,7 @@ from block args like this: ```ruby ActiveSupport::Notifications.subscribe "process_action.action_controller" do |*args| - event = ActiveSupport::Notification::Event.new args + event = ActiveSupport::Notifications::Event.new *args event.name # => "process_action.action_controller" event.duration # => 10 (in milliseconds) |