From fb056c78a7348b8f00024c908fa4b13c606cc1a7 Mon Sep 17 00:00:00 2001
From: Connor Shea <connor.james.shea@gmail.com>
Date: Fri, 1 Jul 2016 09:34:02 -0600
Subject: [PATCH] Upgrade Thin from 1.6.1 to 1.7.0.
Includes support for Rack 2.
Changelog: https://github.com/macournoyer/thin/blob/master/CHANGELOG
---
Gemfile | 2 +-
Gemfile.lock | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Gemfile b/Gemfile
index 5213a59cab013..1c360d165f1b2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -265,7 +265,7 @@ group :development do
gem "sdoc", '~> 0.3.20'
# thin instead webrick
- gem 'thin', '~> 1.6.1'
+ gem 'thin', '~> 1.7.0'
end
group :development, :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index f99b373dbbd46..195cc7a9d3b4a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -727,10 +727,10 @@ GEM
temple (0.7.7)
test_after_commit (0.4.2)
activerecord (>= 3.2)
- thin (1.6.4)
+ thin (1.7.0)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
- rack (~> 1.0)
+ rack (>= 1, < 3)
thor (0.19.1)
thread_safe (0.3.5)
tilt (2.0.5)
@@ -973,7 +973,7 @@ DEPENDENCIES
teaspoon (~> 1.1.0)
teaspoon-jasmine (~> 2.2.0)
test_after_commit (~> 0.4.2)
- thin (~> 1.6.1)
+ thin (~> 1.7.0)
tinder (~> 1.10.0)
turbolinks (~> 2.5.0)
u2f (~> 0.2.1)
--
GitLab