diff --git a/Gemfile b/Gemfile index 868899bc..f17c71fd 100755 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gem 'jbuilder', '~> 2.10' gem 'bootsnap', '~> 1.4', require: false # Large rails application booting enhancer gem 'font_assets', '~> 0.1.14' # for serving fonts on cdn https://github.com/ericallam/font_assets gem 'hamster', '~> 3.0' # Thread-safe collection classes for Ruby -gem 'puma', '~> 4.0', '>= 4.0.1' +gem 'puma', '~> 5.0' gem 'rake', '~> 12.3.2' gem 'sassc-rails', '~> 2.1', '>= 2.1.2' gem 'sassc', '~> 2.0', '>= 2.0.1' diff --git a/Gemfile.lock b/Gemfile.lock index ca143039..aaf298ff 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -236,7 +236,7 @@ GEM byebug (~> 11.0) pry (~> 0.10) public_suffix (3.1.1) - puma (4.3.5) + puma (5.0.2) nio4r (~> 2.0) rack (2.2.3) rack-attack (5.4.2) @@ -440,7 +440,7 @@ DEPENDENCIES pg (~> 0.11) pry (~> 0.12.2) pry-byebug (~> 3.7.0) - puma (~> 4.0, >= 4.0.1) + puma (~> 5.0) qx! rack-attack (~> 5.2) rack-ssl (~> 1.4) diff --git a/NOTICE-ruby b/NOTICE-ruby index 96fd7a3f..5f63aacc 100644 --- a/NOTICE-ruby +++ b/NOTICE-ruby @@ -765,39 +765,42 @@ You can redistribute it and/or modify it under either the terms of the ------ -** puma; version 4.3.5 -- +** puma; version 5.0.2 -- +Zed Shaw, (c) 2005. copyright Evan Phoenix -copyright (c) 2005, Zed Shaw Copyright (c) 2005 Zed A. Shaw Copyright (c) 2011 Evan Phoenix Copyright (c) 2014 Evan Phoenix -Copyright (c) 2011, Evan Phoenix +Copyright (c) 2019, Evan Phoenix. -Some code copyright (c) 2005, Zed Shaw -Copyright (c) 2011, Evan Phoenix +BSD 3-Clause License + +Copyright (c) 2019, Evan Phoenix. Some code by Zed Shaw, (c) 2005. All rights reserved. -Redistribution and use in source and binary forms, with or without +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -* Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. -* Redistributions in binary form must reproduce the above copyright notice - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. -* Neither the name of the Evan Phoenix nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.