diff --git a/Gemfile b/Gemfile index 9a1b2f0f..075c4dcb 100644 --- a/Gemfile +++ b/Gemfile @@ -25,7 +25,7 @@ gem "select2-rails" gem 'redis', '~> 3.0' # Use Puma as the app server -gem 'puma', '~> 3.0' +gem 'puma', '~> 6.0' # Use SCSS for stylesheets gem 'sass-rails', '~> 5.0' # Use Uglifier as compressor for JavaScript assets diff --git a/Gemfile.lock b/Gemfile.lock index 67b0067e..7ec8be51 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,7 +50,7 @@ GEM rails (>= 4.0) request_store (>= 1.0.5) aescrypt (1.0.0) - airbrussh (1.4.0) + airbrussh (1.5.0) sshkit (>= 1.6.1, != 1.7.0) arel (8.0.0) ast (2.4.2) @@ -66,20 +66,19 @@ GEM builder (3.2.4) byebug (11.1.3) cancancan (1.17.0) - capistrano (3.14.1) + capistrano (3.18.0) airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) sshkit (>= 1.9.0) - capistrano-bundler (2.0.1) + capistrano-bundler (2.1.0) capistrano (~> 3.1) capistrano-rails (1.6.1) capistrano (~> 3.1) capistrano-bundler (>= 1.1, < 3) - capistrano3-puma (3.1.1) - capistrano (~> 3.7) - capistrano-bundler - puma (~> 3.4) + capistrano3-puma (1.2.1) + capistrano (~> 3.0) + puma (>= 2.6) carrierwave (1.3.1) activemodel (>= 4.0.0) activesupport (>= 4.0.0) @@ -94,7 +93,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.7) + concurrent-ruby (1.2.2) connection_pool (2.2.3) crass (1.0.6) cups (0.0.7) @@ -118,7 +117,7 @@ GEM htmlentities (4.3.4) httparty (0.15.7) multi_xml (>= 0.5.2) - i18n (1.8.5) + i18n (1.14.1) concurrent-ruby (~> 1.0) jbuilder (2.10.0) activesupport (>= 5.0.0) @@ -169,10 +168,10 @@ GEM myanmar-tools (1.2.0) mysql2 (0.5.3) nested_form (0.3.2) - net-scp (3.0.0) - net-ssh (>= 2.6.5, < 7.0.0) - net-ssh (6.1.0) - nio4r (2.5.2) + net-scp (4.0.0) + net-ssh (>= 2.6.5, < 8.0.0) + net-ssh (7.2.0) + nio4r (2.5.9) nokogiri (1.10.10) mini_portile2 (~> 2.4.0) parallel (1.22.1) @@ -192,7 +191,8 @@ GEM rqrcode (>= 1.0.0) prawn-table (0.2.2) prawn (>= 1.3.0, < 3.0.0) - puma (3.12.6) + puma (6.4.0) + nio4r (~> 2.0) rabbit-mm (1.1.0) rubocop rack (2.2.3) @@ -226,7 +226,7 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (3.1.1) - rake (13.0.1) + rake (13.1.0) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) @@ -312,7 +312,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sshkit (1.21.0) + sshkit (1.21.5) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) tether-rails (1.4.0) @@ -385,7 +385,7 @@ DEPENDENCIES prawn prawn-qrcode prawn-table - puma (~> 3.0) + puma (~> 6.0) rabbit-mm rack-cors rails (~> 5.1.0) diff --git a/config/application.rb b/config/application.rb index 1f1a4a86..23da2be9 100755 --- a/config/application.rb +++ b/config/application.rb @@ -3,8 +3,8 @@ require_relative 'boot' require 'csv' require 'rails/all' # require 'iconv' -require 'openssl' -OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE +# require 'openssl' +# OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE # Require the gems listed in Gemfile, including any gems # you've limited to :test, :development, or :production. @@ -34,6 +34,6 @@ module SXRestaurants ) end end - + end end