Permalink
Browse files

Merge pull request #7990 from mrbrdo/master

Credit for previous commit [ci skip]
  • Loading branch information...
2 parents c1e080d + a774354 commit 55d153ea8d3a6cc9e30636f0dbf423cac16c4ae7 @rafaelfranca rafaelfranca committed Oct 18, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 activemodel/CHANGELOG.md
View
@@ -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.

0 comments on commit 55d153e

Please sign in to comment.