diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-10-29 14:09:54 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-29 14:09:54 +0100 |
| commit | f16d66c5c80b46cffbd4903b0620f7a5330639eb (patch) | |
| tree | b7b8674431511505d086ca9650858c5e246388d7 /Gemfile.lock | |
| parent | a942ad3062285b6b4984fe92f9bd610829f04456 (diff) | |
| parent | 3fd808ab26e98952378d0ba2f616655c1db10368 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 759151fcf..cacf3adf4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -362,8 +362,8 @@ GEM nio4r (2.3.1) nokogiri (1.8.5) mini_portile2 (~> 2.3.0) - nokogumbo (1.5.0) - nokogiri + nokogumbo (2.0.0) + nokogiri (~> 1.8, >= 1.8.4) nsa (0.2.4) activesupport (>= 4.2, < 6) concurrent-ruby (~> 1.0.0) @@ -545,10 +545,10 @@ GEM rufus-scheduler (3.5.2) fugit (~> 1.1, >= 1.1.5) safe_yaml (1.0.4) - sanitize (4.6.6) + sanitize (5.0.0) crass (~> 1.0.2) - nokogiri (>= 1.4.4) - nokogumbo (~> 1.4) + nokogiri (>= 1.8.0) + nokogumbo (~> 2.0) sass (3.6.0) sass-listen (~> 4.0.0) sass-listen (4.0.0) @@ -752,7 +752,7 @@ DEPENDENCIES rspec-rails (~> 3.8) rspec-sidekiq (~> 3.0) rubocop (~> 0.60) - sanitize (~> 4.6) + sanitize (~> 5.0) scss_lint (~> 0.57) sidekiq (~> 5.2) sidekiq-bulk (~> 0.1.1) |