diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2016-05-10 07:22:32 +0200 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2016-05-10 07:22:32 +0200 |
| commit | 943b96c738cd37023c986d89ad5b8af8254001b3 (patch) | |
| tree | 69f25be3e44fbb989973dc8df5485b8db337f9be | |
| parent | 070a5911a03d66913a1fcd7c7256f21569449888 (diff) | |
| parent | c80446fbee0c9cabba9dcb3ac3a63c6ca150f65c (diff) | |
| download | rails-943b96c738cd37023c986d89ad5b8af8254001b3.tar.gz rails-943b96c738cd37023c986d89ad5b8af8254001b3.tar.bz2 rails-943b96c738cd37023c986d89ad5b8af8254001b3.zip | |
Merge pull request #24948 from prathamesh-sonpatki/fix-gemfile-lock
Fix Gemfile.lock by updating rails-dom-testing
| -rw-r--r-- | Gemfile.lock | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index e658f2bbfa..2e3b0349a6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -45,19 +45,19 @@ PATH actionview (= 5.0.0.rc1) activejob (= 5.0.0.rc1) mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.5) + rails-dom-testing (~> 2.0) actionpack (5.0.0.rc1) actionview (= 5.0.0.rc1) activesupport (= 5.0.0.rc1) rack (~> 2.x) rack-test (~> 0.6.3) - rails-dom-testing (~> 1.0, >= 1.0.5) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) actionview (5.0.0.rc1) activesupport (= 5.0.0.rc1) builder (~> 3.1) erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) activejob (5.0.0.rc1) activesupport (= 5.0.0.rc1) @@ -193,12 +193,9 @@ GEM rack (>= 0.4) rack-test (0.6.3) rack (>= 1.0) - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) - activesupport (>= 4.2.0.beta, < 5.0) + rails-dom-testing (2.0.0) + activesupport (>= 4.2.0, < 6.0) nokogiri (~> 1.6.0) - rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.3) loofah (~> 2.0) rake (11.1.2) |