diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-18 07:34:17 -0700 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-18 07:34:17 -0700 |
commit | 55d153ea8d3a6cc9e30636f0dbf423cac16c4ae7 (patch) | |
tree | f8f1e7f2a5a6e0603713fb10f3de8887c54d0e9d | |
parent | c1e080d515af180f6bf92ab83d7af23819e2a063 (diff) | |
parent | a774354dfea6dfe9b0caff2ab1df52a1f73716be (diff) | |
download | rails-55d153ea8d3a6cc9e30636f0dbf423cac16c4ae7.tar.gz rails-55d153ea8d3a6cc9e30636f0dbf423cac16c4ae7.tar.bz2 rails-55d153ea8d3a6cc9e30636f0dbf423cac16c4ae7.zip |
Merge pull request #7990 from mrbrdo/master
Credit for previous commit [ci skip]
-rw-r--r-- | activemodel/CHANGELOG.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md index 2c966943ee..aa42bf762f 100644 --- a/activemodel/CHANGELOG.md +++ b/activemodel/CHANGELOG.md @@ -76,6 +76,6 @@ * Trim down Active Model API by removing `valid?` and `errors.full_messages` *José Valim* -* When `^` or `$` are used in the regular expression provided to `validates_format_of` and the :multiline option is not set to true, an exception will be raised. This is to prevent security vulnerabilities when using `validates_format_of`. The problem is described in detail in the Rails security guide. +* When `^` or `$` are used in the regular expression provided to `validates_format_of` and the :multiline option is not set to true, an exception will be raised. This is to prevent security vulnerabilities when using `validates_format_of`. The problem is described in detail in the Rails security guide *Jan Berdajs + Egor Homakov* Please check [3-2-stable](https://github.com/rails/rails/blob/3-2-stable/activemodel/CHANGELOG.md) for previous changes. |