diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-10-05 21:48:25 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-05 21:48:25 +0200 |
| commit | 98bb6815a774d6101cb0c6c909b4dba7599f2ef8 (patch) | |
| tree | a6083a4b16dfffcb49ed787a719ddcdb4741cc49 /Gemfile.lock | |
| parent | c6e4c489425bd3b66a07d37f39e1678d69226fa8 (diff) | |
| parent | 144d73730de38da84d605f876157bc9bd45c25b4 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 1dd20f123..1f8243b8f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -373,7 +373,7 @@ GEM addressable (~> 2.3) nokogiri (~> 1.5) omniauth (~> 1.2) - omniauth-saml (1.10.0) + omniauth-saml (1.10.1) omniauth (~> 1.3, >= 1.3.2) ruby-saml (~> 1.7) orm_adapter (0.5.0) @@ -392,7 +392,7 @@ GEM av (~> 0.9.0) paperclip (>= 2.5.2) parallel (1.12.1) - parallel_tests (2.21.3) + parallel_tests (2.23.0) parallel parser (2.5.1.2) ast (~> 2.4.0) @@ -421,7 +421,7 @@ GEM pry-rails (0.3.6) pry (>= 0.10.4) public_suffix (3.0.3) - puma (3.11.4) + puma (3.12.0) pundit (1.1.0) activesupport (>= 3.0.0) raabro (1.1.6) @@ -535,7 +535,7 @@ GEM ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) ruby-progressbar (1.9.0) - ruby-saml (1.7.2) + ruby-saml (1.9.0) nokogiri (>= 1.5.10) rufus-scheduler (3.5.2) fugit (~> 1.1, >= 1.1.5) @@ -724,7 +724,7 @@ DEPENDENCIES ox (~> 2.10) paperclip (~> 6.0) paperclip-av-transcoder (~> 0.6) - parallel_tests (~> 2.21) + parallel_tests (~> 2.23) pg (~> 1.1) pghero (~> 2.2) pkg-config (~> 1.3) @@ -733,7 +733,7 @@ DEPENDENCIES private_address_check (~> 0.5) pry-byebug (~> 3.6) pry-rails (~> 0.3) - puma (~> 3.11) + puma (~> 3.12) pundit (~> 1.1) rack-attack (~> 5.4) rack-cors (~> 1.0) |