diff options
| author | ThibG <thib@sitedethib.com> | 2019-06-04 17:12:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-04 17:12:25 +0200 |
| commit | 58946fef3c05342289c1c50132996fc4fd01cf68 (patch) | |
| tree | af2df753e591d65a77e55c851cfe2b1979f47683 /Gemfile.lock | |
| parent | 1d5434d34c9bf86dea669676b7e8587255d38135 (diff) | |
| parent | 8eb7c3304ee1260de3e8e1d1f32bd67409488756 (diff) | |
Merge pull request #1079 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index fe7586140..e45bcb5ff 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -481,7 +481,7 @@ GEM rdf-normalize (0.3.3) rdf (>= 2.2, < 4.0) redcarpet (3.4.0) - redis (4.1.1) + redis (4.1.2) redis-actionpack (5.0.2) actionpack (>= 4.0, < 6) redis-rack (>= 1, < 3) @@ -530,14 +530,14 @@ GEM rspec-core (~> 3.0, >= 3.0.0) sidekiq (>= 2.4.0) rspec-support (3.8.0) - rubocop (0.70.0) + rubocop (0.71.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.6) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - ruby-progressbar (1.10.0) + ruby-progressbar (1.10.1) ruby-saml (1.9.0) nokogiri (>= 1.5.10) rufus-scheduler (3.5.2) @@ -636,7 +636,7 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - webpacker (4.0.4) + webpacker (4.0.6) activesupport (>= 4.2) rack-proxy (>= 0.6.1) railties (>= 4.2) @@ -750,7 +750,7 @@ DEPENDENCIES rqrcode (~> 0.10) rspec-rails (~> 3.8) rspec-sidekiq (~> 3.0) - rubocop (~> 0.70) + rubocop (~> 0.71) sanitize (~> 5.0) scss_lint (~> 0.58) sidekiq (~> 5.2) |