From 89502edb70e734938c3325b32fd74e0acf885edd Mon Sep 17 00:00:00 2001 From: Alex Kotov Date: Fri, 14 Feb 2020 19:37:14 +0500 Subject: [PATCH] Upgrade gems --- Gemfile | 4 ++-- Gemfile.lock | 17 ++++++----------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/Gemfile b/Gemfile index ae46cf0..0336e17 100644 --- a/Gemfile +++ b/Gemfile @@ -26,9 +26,9 @@ gem 'pry-doc', '= 1.0.0', github: 'pry/pry-doc' gem 'pry-rails', '~> 0.3' gem 'puma', '~> 4.2' gem 'pundit', '~> 2.1' -gem 'rack', '= 2.2.0', github: 'rack/rack' +gem 'rack', '~> 2.2.0' gem 'rack-attack', '~> 6.1' -gem 'rails', '~> 6.0.2', '~> 6.0.2.1' +gem 'rails', '~> 6.0.2', '>= 6.0.2.1' gem 'rails-i18n', '~> 6.0.0' gem 'recaptcha', '~> 5.1' gem 'redis', '~> 4.1' diff --git a/Gemfile.lock b/Gemfile.lock index bae7dde..e0cd2f1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,12 +6,6 @@ GIT pry (~> 0.11) yard (~> 0.9.11) -GIT - remote: https://github.com/rack/rack.git - revision: 01556901e519159982c28a8511b18ffb22f0454d - specs: - rack (2.2.0) - GEM remote: https://rubygems.org/ specs: @@ -138,7 +132,7 @@ GEM childprocess (3.0.0) choice (0.2.0) coderay (1.1.2) - concurrent-ruby (1.1.5) + concurrent-ruby (1.1.6) connection_pool (2.2.2) coveralls (0.7.1) multi_json (~> 1.3) @@ -261,7 +255,7 @@ GEM mime-types (3.3.1) mime-types-data (~> 3.2015) mime-types-data (3.2019.1009) - mimemagic (0.3.3) + mimemagic (0.3.4) mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.14.0) @@ -275,7 +269,7 @@ GEM net-ssh (5.2.0) netrc (0.11.0) nio4r (2.5.2) - nokogiri (1.10.7) + nokogiri (1.10.8) mini_portile2 (~> 2.4.0) oauth2 (1.4.2) faraday (>= 0.8, < 2.0) @@ -313,6 +307,7 @@ GEM activesupport (>= 3.0.0) pundit-matchers (1.6.0) rspec-rails (>= 3.0.0) + rack (2.2.2) rack-attack (6.2.2) rack (>= 1.0, < 3) rack-protection (2.0.8.1) @@ -528,9 +523,9 @@ DEPENDENCIES puma (~> 4.2) pundit (~> 2.1) pundit-matchers (~> 1.6) - rack (= 2.2.0)! + rack (~> 2.2.0) rack-attack (~> 6.1) - rails (~> 6.0.2.1, ~> 6.0.2) + rails (~> 6.0.2, >= 6.0.2.1) rails-erd (~> 1.5) rails-i18n (~> 6.0.0) recaptcha (~> 5.1)