diff options
author | ThibG <thib@sitedethib.com> | 2019-01-14 11:48:36 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-14 11:48:36 +0100 |
commit | 077639c27409f897e87522dd18a51801b6cbc40d (patch) | |
tree | a70b542e4bb88ed78d221765b5a675de0e323626 /Gemfile.lock | |
parent | 2cfa55185a5fc7d93a160a4e9a4730aae6725b0f (diff) | |
parent | 4cec7a77c37e23117323a4ed8f609939ab50b4d6 (diff) |
Merge pull request #886 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 7d2878483..38bbd2c1c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -429,7 +429,7 @@ GEM rack-attack (5.4.2) rack (>= 1.0, < 3) rack-cors (1.0.2) - rack-protection (2.0.4) + rack-protection (2.0.5) rack rack-proxy (0.6.4) rack @@ -553,8 +553,9 @@ GEM scss_lint (0.57.1) rake (>= 0.9, < 13) sass (~> 3.5, >= 3.5.5) - sidekiq (5.2.3) + sidekiq (5.2.5) connection_pool (~> 2.2, >= 2.2.2) + rack (>= 1.5.0) rack-protection (>= 1.5.0) redis (>= 3.3.5, < 5) sidekiq-bulk (0.2.0) @@ -639,7 +640,7 @@ GEM activesupport (>= 4.2) rack-proxy (>= 0.6.1) railties (>= 4.2) - webpush (0.3.5) + webpush (0.3.6) hkdf (~> 0.2) jwt (~> 2.0) websocket-driver (0.7.0) |