Skip to content

Commit 943b96c

Browse files
committed
Merge pull request rails#24948 from prathamesh-sonpatki/fix-gemfile-lock
Fix Gemfile.lock by updating rails-dom-testing
2 parents 070a591 + c80446f commit 943b96c

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

Gemfile.lock

+5-8
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,19 @@ PATH
4545
actionview (= 5.0.0.rc1)
4646
activejob (= 5.0.0.rc1)
4747
mail (~> 2.5, >= 2.5.4)
48-
rails-dom-testing (~> 1.0, >= 1.0.5)
48+
rails-dom-testing (~> 2.0)
4949
actionpack (5.0.0.rc1)
5050
actionview (= 5.0.0.rc1)
5151
activesupport (= 5.0.0.rc1)
5252
rack (~> 2.x)
5353
rack-test (~> 0.6.3)
54-
rails-dom-testing (~> 1.0, >= 1.0.5)
54+
rails-dom-testing (~> 2.0)
5555
rails-html-sanitizer (~> 1.0, >= 1.0.2)
5656
actionview (5.0.0.rc1)
5757
activesupport (= 5.0.0.rc1)
5858
builder (~> 3.1)
5959
erubis (~> 2.7.0)
60-
rails-dom-testing (~> 1.0, >= 1.0.5)
60+
rails-dom-testing (~> 2.0)
6161
rails-html-sanitizer (~> 1.0, >= 1.0.2)
6262
activejob (5.0.0.rc1)
6363
activesupport (= 5.0.0.rc1)
@@ -193,12 +193,9 @@ GEM
193193
rack (>= 0.4)
194194
rack-test (0.6.3)
195195
rack (>= 1.0)
196-
rails-deprecated_sanitizer (1.0.3)
197-
activesupport (>= 4.2.0.alpha)
198-
rails-dom-testing (1.0.7)
199-
activesupport (>= 4.2.0.beta, < 5.0)
196+
rails-dom-testing (2.0.0)
197+
activesupport (>= 4.2.0, < 6.0)
200198
nokogiri (~> 1.6.0)
201-
rails-deprecated_sanitizer (>= 1.0.1)
202199
rails-html-sanitizer (1.0.3)
203200
loofah (~> 2.0)
204201
rake (11.1.2)

0 commit comments

Comments
 (0)