diff options
author | ThibG <thib@sitedethib.com> | 2018-05-10 00:28:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-10 00:28:54 +0200 |
commit | 34142ab29c33104793afe3199f102d84b83b9b57 (patch) | |
tree | afba23a3f169d7445f80ffe555985a295c98f6e1 /Gemfile.lock | |
parent | 143878d9dadd03347c54c9261b9bc754a1d0f5bc (diff) | |
parent | 5d8052e7156c913a551b923c51d508b1ea8837b3 (diff) |
Merge pull request #472 from ThibG/glitch-soc/merge
Merge upstream changes
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 36554c1ed..41307654c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -503,8 +503,6 @@ GEM rspec-expectations (~> 3.7.0) rspec-mocks (~> 3.7.0) rspec-support (~> 3.7.0) - rspec-retry (0.5.7) - rspec-core (> 3.3) rspec-sidekiq (3.0.3) rspec-core (~> 3.0, >= 3.0.0) sidekiq (>= 2.4.0) @@ -729,7 +727,6 @@ DEPENDENCIES redis-rails (~> 5.0) rqrcode (~> 0.10) rspec-rails (~> 3.7) - rspec-retry (~> 0.5) rspec-sidekiq (~> 3.0) rubocop (~> 0.55) ruby-progressbar (~> 1.4) |