diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-08-17 21:22:00 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-08-17 21:22:00 -0300 |
| commit | 20425986d1d90e9497b16a3780efd507293d401c (patch) | |
| tree | 268a11144c9cf80d5ed4d8a5114cd33d4ee022e5 /actionpack | |
| parent | a2400308eab88b5eff27e05d1f7624345fb33b54 (diff) | |
| parent | 1e2ffe7ae67c37cf8170be0c864cbdaacc27c1b4 (diff) | |
| download | rails-20425986d1d90e9497b16a3780efd507293d401c.tar.gz rails-20425986d1d90e9497b16a3780efd507293d401c.tar.bz2 rails-20425986d1d90e9497b16a3780efd507293d401c.zip | |
Merge pull request #16525 from kaspth/partial-release-prep
Prepare for partial release.
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | actionpack/actionpack.gemspec | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index af1334cff6..2613796d54 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,6 +1,4 @@ -* Deprecated TagAssertions. - - Moved DomAssertions and SelectorAssertions to Action View. +* Deleted the deprecated TagAssertions. *Kasper Timm Hansen* diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec index 5a72bb1a7f..5834e79668 100644 --- a/actionpack/actionpack.gemspec +++ b/actionpack/actionpack.gemspec @@ -23,8 +23,7 @@ Gem::Specification.new do |s| s.add_dependency 'rack', '~> 1.6.0.alpha' s.add_dependency 'rack-test', '~> 0.6.2' - s.add_dependency 'rails-dom-testing' - s.add_dependency 'rails-html-sanitizer' + s.add_dependency 'rails-deprecated_sanitizer' s.add_dependency 'actionview', version s.add_development_dependency 'activemodel', version |