From a9c007a169957cf8889e958de3f5cb879815fee1 Mon Sep 17 00:00:00 2001 From: Frankie Roberto Date: Fri, 31 Jan 2020 10:51:52 +0000 Subject: [PATCH] switch rack gem to use released 2.1.2 version https://github.com/rack/rack/pull/1428 has now been merged and released, so we no longer need to pin to a specific commit. --- psd-web/Gemfile | 2 +- psd-web/Gemfile.lock | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/psd-web/Gemfile b/psd-web/Gemfile index 6c8ae7878a..d95f6b245c 100644 --- a/psd-web/Gemfile +++ b/psd-web/Gemfile @@ -22,7 +22,7 @@ gem "pg" gem "pghero" gem "puma" gem "pundit" -gem "rack", github: "rack/rack", ref: "8659d9f073c79dac9ddd7ab84b8e647a1ad4d34e" # Until https://github.com/rack/rack/pull/1428 is released +gem "rack", "~> 2.1.2" gem "rails", "5.2.3" gem "redcarpet" gem "redis-rails" diff --git a/psd-web/Gemfile.lock b/psd-web/Gemfile.lock index b77efb2459..e3365bb7b3 100644 --- a/psd-web/Gemfile.lock +++ b/psd-web/Gemfile.lock @@ -5,13 +5,6 @@ GIT specs: govuk-design-system-rails (0.5.0) -GIT - remote: https://github.com/rack/rack.git - revision: 8659d9f073c79dac9ddd7ab84b8e647a1ad4d34e - ref: 8659d9f073c79dac9ddd7ab84b8e647a1ad4d34e - specs: - rack (2.2.0) - GIT remote: https://github.com/randym/axlsx.git revision: c593a08b2a929dac7aa8dc418b55e26b4c49dc34 @@ -256,6 +249,7 @@ GEM pundit (2.1.0) activesupport (>= 3.0.0) raabro (1.1.6) + rack (2.1.2) rack-protection (2.0.7) rack rack-proxy (0.6.5) @@ -514,7 +508,7 @@ DEPENDENCIES pry-doc puma pundit - rack! + rack (~> 2.1.2) rails (= 5.2.3) rails-controller-testing redcarpet