diff options
| author | David N. Welton <davidw@dedasys.com> | 2010-11-22 16:06:28 +0100 |
|---|---|---|
| committer | David N. Welton <davidw@dedasys.com> | 2010-11-22 16:06:28 +0100 |
| commit | 818b366c3e3645b3375ee0b1d1023621dbeaede2 (patch) | |
| tree | 6e5f450c52666c15cd61fcac43bd7bfe6115d681 | |
| parent | 0598bd4d2db332e05fb4189169441fb1ad12e9b1 (diff) | |
| parent | 2515ad8a3e03402c1d5a5f9b46c48a3a9bf75081 (diff) | |
| download | rails-818b366c3e3645b3375ee0b1d1023621dbeaede2.tar.gz rails-818b366c3e3645b3375ee0b1d1023621dbeaede2.tar.bz2 rails-818b366c3e3645b3375ee0b1d1023621dbeaede2.zip | |
Merge branch 'master' of github.com:lifo/docrails
| -rw-r--r-- | railties/guides/source/active_record_validations_callbacks.textile | 2 | ||||
| -rw-r--r-- | railties/guides/source/security.textile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/guides/source/active_record_validations_callbacks.textile b/railties/guides/source/active_record_validations_callbacks.textile index 9ce0423244..0824ba450c 100644 --- a/railties/guides/source/active_record_validations_callbacks.textile +++ b/railties/guides/source/active_record_validations_callbacks.textile @@ -355,7 +355,7 @@ This helper validates that the specified attributes are not empty. It uses the + <ruby> class Person < ActiveRecord::Base - validates :name, :presence => true, :login, :email + validates :name, :login, :email, :presence => true end </ruby> diff --git a/railties/guides/source/security.textile b/railties/guides/source/security.textile index 6f766430c1..5b24d8c8e3 100644 --- a/railties/guides/source/security.textile +++ b/railties/guides/source/security.textile @@ -550,7 +550,7 @@ Ruby uses a slightly different approach than many other languages to match the e <ruby> class File < ActiveRecord::Base - validates :name, format => /^[\w\.\-\+]+$/ + validates :name, :format => /^[\w\.\-\+]+$/ end </ruby> |