diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-10 16:52:00 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-10 16:52:00 -0300 |
| commit | 3229eda00c2a38526787fddb6cc307cfee5c5ac6 (patch) | |
| tree | 9b45bf0c52e5b20ab403a5ac0025b9b1b18a5ce3 /actionpack/CHANGELOG.md | |
| parent | 6e76031e8f1f815b390f966cb21e25c66e5ded50 (diff) | |
| parent | ff1b7e75357eb7797f25aeab33994765130db67f (diff) | |
| download | rails-3229eda00c2a38526787fddb6cc307cfee5c5ac6.tar.gz rails-3229eda00c2a38526787fddb6cc307cfee5c5ac6.tar.bz2 rails-3229eda00c2a38526787fddb6cc307cfee5c5ac6.zip | |
Merge pull request #11218 from kaspth/loofah-integration
Loofah-integration
Conflicts:
actionpack/CHANGELOG.md
actionview/CHANGELOG.md
Diffstat (limited to 'actionpack/CHANGELOG.md')
| -rw-r--r-- | actionpack/CHANGELOG.md | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index fb36396167..f3cfedef4f 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,3 +1,9 @@ +* Deprecated TagAssertions. + + Moved DomAssertions and SelectorAssertions to Action View. + + *Kasper Timm Hansen* + * Prepend a JS comment to JSONP callbacks. Addresses CVE-2014-4671 ("Rosetta Flash") |