diff options
| author | ThibG <thib@sitedethib.com> | 2019-06-07 22:15:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-07 22:15:44 +0200 |
| commit | 11c28abcfebcf8827f99a86540076347f1a1edff (patch) | |
| tree | b5d615001967cf102e88fac86b8ddb3227600109 /Gemfile.lock | |
| parent | 83600198961cce9bfe82cf0f0c33286703bc86d1 (diff) | |
| parent | aec3fa35fda50e7f618dcf8b8f14e78a995583f4 (diff) | |
Merge pull request #1097 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index be8ce27cd..73f0d63f5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -534,6 +534,9 @@ GEM rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) + rubocop-rails (2.0.0) + rack (>= 2.0) + rubocop (>= 0.70.0) ruby-progressbar (1.10.1) ruby-saml (1.9.0) nokogiri (>= 1.5.10) @@ -740,6 +743,7 @@ DEPENDENCIES rspec-rails (~> 3.8) rspec-sidekiq (~> 3.0) rubocop (~> 0.71) + rubocop-rails (~> 2.0) sanitize (~> 5.0) sidekiq (~> 5.2) sidekiq-bulk (~> 0.2.0) |