diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-22 20:22:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-22 20:22:18 +0100 |
| commit | 9f56511860493b770c2e535be0f8ce4777c8d373 (patch) | |
| tree | 681e3e5a0c0206210e71a187a11c010646d82050 /Gemfile.lock | |
| parent | bde9196b70299405ebe9b16500b7a3f65539b2c3 (diff) | |
| parent | edd54411124b271622d7a2af4efdfe1a0a35cac4 (diff) | |
Merge pull request #965 from ThibG/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 5df1dc0ad..572a454ea 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -127,7 +127,7 @@ GEM sshkit (~> 1.3) capistrano-yarn (2.0.2) capistrano (~> 3.0) - capybara (3.14.0) + capybara (3.15.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -366,7 +366,7 @@ GEM concurrent-ruby (~> 1.0, >= 1.0.2) sidekiq (>= 3.5) statsd-ruby (~> 1.4, >= 1.4.0) - oj (3.7.10) + oj (3.7.11) omniauth (1.9.0) hashie (>= 3.4.6, < 3.7.0) rack (>= 1.6.2, < 3) @@ -422,7 +422,7 @@ GEM pry (>= 0.10.4) psych (3.1.0) public_suffix (3.0.3) - puma (3.12.0) + puma (3.12.1) pundit (2.0.1) activesupport (>= 3.0.0) raabro (1.1.6) @@ -672,7 +672,7 @@ DEPENDENCIES capistrano-rails (~> 1.4) capistrano-rbenv (~> 2.1) capistrano-yarn (~> 2.0) - capybara (~> 3.14) + capybara (~> 3.15) charlock_holmes (~> 0.7.6) chewy (~> 5.0) cld3 (~> 3.2.3) |