diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-02-12 20:32:48 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-02-12 20:32:48 +0100 |
| commit | 0e34e91661d47ffbb08121c74c8a2de5266de0c8 (patch) | |
| tree | 949024a721989fb2de04de0412cdbdbd41990e36 /Gemfile.lock | |
| parent | a3ba28eb17d75af37396359e8c37675e06605ccf (diff) | |
| parent | 2f80a348c9de3de6dbf220f9e12d5906042b3f73 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 957ca70a6..a37ff9989 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,7 +38,7 @@ GEM erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - active_model_serializers (0.10.8) + active_model_serializers (0.10.9) actionpack (>= 4.1, < 6) activemodel (>= 4.1, < 6) case_transform (>= 0.2) @@ -527,7 +527,7 @@ GEM rspec-core (~> 3.0, >= 3.0.0) sidekiq (>= 2.4.0) rspec-support (3.8.0) - rubocop (0.63.1) + rubocop (0.64.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.5, != 2.5.1.1) @@ -749,7 +749,7 @@ DEPENDENCIES rqrcode (~> 0.10) rspec-rails (~> 3.8) rspec-sidekiq (~> 3.0) - rubocop (~> 0.63) + rubocop (~> 0.64) sanitize (~> 5.0) scss_lint (~> 0.57) sidekiq (~> 5.2) |