aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2015-02-01 10:31:53 -0200
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2015-02-01 10:31:54 -0200
commitfdeef19833ce47b03bcb792f1850f6233f050b9f (patch)
tree8da97ee3782434caddee95a6bd9c52c795e2a46a /activerecord
parente374db237198b07e778c41320922d574fef4bc5e (diff)
downloadrails-fdeef19833ce47b03bcb792f1850f6233f050b9f.tar.gz
rails-fdeef19833ce47b03bcb792f1850f6233f050b9f.tar.bz2
rails-fdeef19833ce47b03bcb792f1850f6233f050b9f.zip
Move required error message and changelog to Active Record
The new association error belongs to Active Record, not Active Model. See #18700 for reference.
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG.md5
-rw-r--r--activerecord/lib/active_record/locale/en.yml1
2 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 4cc62346cb..dd0bbeaaac 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,8 @@
+* 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*
+
* Fixed ActiveRecord::Relation#group method when argument is SQL reserved key word:
Example:
diff --git a/activerecord/lib/active_record/locale/en.yml b/activerecord/lib/active_record/locale/en.yml
index b1fbd38622..8a3c27e6da 100644
--- a/activerecord/lib/active_record/locale/en.yml
+++ b/activerecord/lib/active_record/locale/en.yml
@@ -7,6 +7,7 @@ en:
# Default error messages
errors:
messages:
+ required: "must exist"
taken: "has already been taken"
# Active Record models configuration