Skip to content
This repository has been archived by the owner on Dec 9, 2020. It is now read-only.

Commit

Permalink
Merge branch 'master' into dependabot/bundler/test/dummy/rails-html-s…
Browse files Browse the repository at this point in the history
…anitizer-1.3.0
  • Loading branch information
alsmola authored Oct 18, 2019
2 parents e91b869 + e4024cb commit 713e749
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.0.5)
concurrent-ruby (1.1.5)
crass (1.0.4)
dotenv (2.4.0)
erubi (1.7.1)
Expand All @@ -88,13 +88,13 @@ GEM
method_source (0.9.0)
mimemagic (0.3.2)
mini_mime (1.0.0)
mini_portile2 (2.3.0)
mini_portile2 (2.4.0)
minitest (5.11.3)
nio4r (2.3.1)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
pg (1.0.0)
rack (2.0.5)
rack (2.0.7)
rack-test (1.0.0)
rack (>= 1.0, < 3)
rails (5.2.0)
Expand Down Expand Up @@ -137,7 +137,7 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sprockets (3.7.1)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
Expand Down
8 changes: 4 additions & 4 deletions test/dummy/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.0.5)
concurrent-ruby (1.1.5)
crass (1.0.5)
dotenv (2.2.1)
erubi (1.7.0)
execjs (2.7.0)
ffi (1.9.18)
ffi (1.11.1)
geoip (1.6.3)
globalid (0.4.1)
activesupport (>= 4.2.0)
Expand All @@ -87,7 +87,7 @@ GEM
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
pg (0.21.0)
rack (2.0.3)
rack (2.0.7)
rack-test (0.7.0)
rack (>= 1.0, < 3)
rails (5.1.4)
Expand Down Expand Up @@ -129,7 +129,7 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sprockets (3.7.1)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
Expand Down

0 comments on commit 713e749

Please sign in to comment.