diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-02-01 08:42:22 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-02-01 08:42:22 -0800 |
| commit | aa8ade5811db1873a6091f3aa6282e77d22d9d3e (patch) | |
| tree | ae6272f67eddcc6293579542c6e1e8dc993bd30f /activemodel | |
| parent | 82e710f8471622bd3f3d1640e42ad14f9c9309b9 (diff) | |
| parent | fdeef19833ce47b03bcb792f1850f6233f050b9f (diff) | |
| download | rails-aa8ade5811db1873a6091f3aa6282e77d22d9d3e.tar.gz rails-aa8ade5811db1873a6091f3aa6282e77d22d9d3e.tar.bz2 rails-aa8ade5811db1873a6091f3aa6282e77d22d9d3e.zip | |
Merge branch 'master' into mdluo-master
* master:
Move required error message and changelog to Active Record
Use public Module#include, in favor of https://bugs.ruby-lang.org/issues/8846
Use Module#include instead of send :include, since now is a public method [ci skip]
:scissors: warning from controller renderer test
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'activemodel')
| -rw-r--r-- | activemodel/CHANGELOG.md | 5 | ||||
| -rw-r--r-- | activemodel/lib/active_model/locale/en.yml | 3 |
2 files changed, 1 insertions, 7 deletions
diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md index 4c78fc91a5..5830a00bc5 100644 --- a/activemodel/CHANGELOG.md +++ b/activemodel/CHANGELOG.md @@ -1,8 +1,3 @@ -* Change the default error message from `can't be blank` to `must exist` for - the presence validator of the `:required` option on `belongs_to`/`has_one` associations. - - *Henrik Nygren* - * Assigning an unknown attribute key to an `ActiveModel` instance during initialization will now raise `ActiveModel::AttributeAssignment::UnknownAttributeError` instead of `NoMethodError` diff --git a/activemodel/lib/active_model/locale/en.yml b/activemodel/lib/active_model/locale/en.yml index b0b20ee0bf..b11c8f53b4 100644 --- a/activemodel/lib/active_model/locale/en.yml +++ b/activemodel/lib/active_model/locale/en.yml @@ -14,10 +14,9 @@ en: empty: "can't be empty" blank: "can't be blank" present: "must be blank" - required: "must exist" too_long: one: "is too long (maximum is 1 character)" - other: "is too long (maximum is %{count} characters)" + other: "is too long (maximum is %{count} characters)" too_short: one: "is too short (minimum is 1 character)" other: "is too short (minimum is %{count} characters)" |