diff options
| author | ThibG <thib@sitedethib.com> | 2019-07-21 00:53:28 +0200 |
|---|---|---|
| committer | Holly 'Frinkel' Lotor <admin@frinkel.tech> | 2020-01-20 16:55:55 -0500 |
| commit | b0630ddc8261250c5edbf2907648695041649e98 (patch) | |
| tree | 9ca374e4e98598efced200e4a993875245ab93b6 /Gemfile.lock | |
| parent | 9447566b8ed8e532c13dd97ecd53681029fdcec0 (diff) | |
Original upstream merge
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 1cda2abde..b3588ffaf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -19,6 +19,13 @@ GIT specs: http_parser.rb (0.6.1) +GIT + remote: https://github.com/witgo/nilsimsa + revision: fd184883048b922b176939f851338d0a4971a532 + ref: fd184883048b922b176939f851338d0a4971a532 + specs: + nilsimsa (1.1.2) + GEM remote: https://rubygems.org/ specs: @@ -429,12 +436,12 @@ GEM pry-rails (0.3.9) pry (>= 0.10.4) public_suffix (4.0.3) - puma (3.12.2) pundit (2.1.0) activesupport (>= 3.0.0) raabro (1.1.6) rack-attack (6.2.2) - rack (>= 1.0, < 3) + puma (4.0.1) + nio4r (~> 2.0) rack-cors (1.1.1) rack (>= 2.0.0) rack-protection (2.0.8.1) @@ -717,6 +724,7 @@ DEPENDENCIES microformats (~> 4.1) mime-types (~> 3.2) net-ldap (~> 0.10) + nilsimsa! nokogiri (~> 1.10) nsa (~> 0.2) oj (~> 3.7) @@ -735,10 +743,10 @@ DEPENDENCIES private_address_check (~> 0.5) pry-byebug (~> 3.7) pry-rails (~> 0.3) - puma (~> 3.12) + puma (~> 4.0) pundit (~> 2.0) rack! - rack-attack (~> 6.0) + rack-attack (~> 6.1) rack-cors (~> 1.0) rails (~> 5.2.3) rails-controller-testing (~> 1.0) |