diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-05-31 16:49:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-31 16:49:48 +0200 |
| commit | 02dffa8edd097014578774aed30249ed08d2f3a4 (patch) | |
| tree | 639cb699c8fd680ba604486126211d5755b10060 /Gemfile.lock | |
| parent | bbc9ca5d38c342f3afa87835f86cdbe82a9affdb (diff) | |
| parent | fb8c5979b40441814b41f06cc4d2c4d3f1a046f9 (diff) | |
Merge pull request #1546 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 7bb1930a0..252788b55 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -273,7 +273,7 @@ GEM http-parser (1.2.1) ffi-compiler (>= 1.0, < 2.0) http_accept_language (2.1.1) - httplog (1.4.3) + httplog (1.5.0) rack (>= 1.0) rainbow (>= 2.0.0) i18n (1.8.10) @@ -525,7 +525,7 @@ GEM rspec-support (3.10.2) rspec_junit_formatter (0.4.1) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.14.0) + rubocop (1.15.0) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) @@ -716,7 +716,7 @@ DEPENDENCIES htmlentities (~> 4.3) http (~> 4.4) http_accept_language (~> 2.1) - httplog (~> 1.4.3) + httplog (~> 1.5.0) i18n-tasks (~> 0.9) idn-ruby iso-639 @@ -771,7 +771,7 @@ DEPENDENCIES rspec-rails (~> 5.0) rspec-sidekiq (~> 3.1) rspec_junit_formatter (~> 0.4) - rubocop (~> 1.14) + rubocop (~> 1.15) rubocop-rails (~> 2.10) ruby-progressbar (~> 1.11) sanitize (~> 5.2) |