From 291f2e29be2311f0f3f9cfdb3e05c32d96c2adab Mon Sep 17 00:00:00 2001
From: Takuya Noguchi <takninnovationresearch@gmail.com>
Date: Tue, 2 Aug 2022 04:26:52 +0000
Subject: [PATCH] Remove thin gem
thin was introduced to GitLab only for development purpose in 54a24608
in GitLab 4.1 probably to improve gitolite integration, which was
removed from GitLab.
Puma is now the default web server, which can be used normally for
development purpose.
GitLab 4.1: https://about.gitlab.com/releases/2013/01/22/gitlab-4-1-released/
https://gitlab.com/gitlab-org/gitlab/-/commit/54a24608a29d113f0c607027cddd8b6947c6a55c
Changelog: other
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
---
Gemfile | 3 ---
Gemfile.lock | 7 -------
doc/development/caching.md | 4 ++--
3 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/Gemfile b/Gemfile
index 1064c63a5c38b..10db5310ca518 100644
--- a/Gemfile
+++ b/Gemfile
@@ -354,9 +354,6 @@ group :development do
# Better errors handler
gem 'better_errors', '~> 2.9.0'
- # thin instead webrick
- gem 'thin', '~> 1.8.0'
-
gem 'sprite-factory', '~> 1.7'
end
diff --git a/Gemfile.lock b/Gemfile.lock
index a124621edeb65..4eeb168ce1384 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -257,7 +257,6 @@ GEM
git
css_parser (1.11.0)
addressable
- daemons (1.3.1)
danger (8.6.1)
claide (~> 1.0)
claide-plugins (>= 0.9.2)
@@ -373,7 +372,6 @@ GEM
tzinfo
ethon (0.15.0)
ffi (>= 1.15.0)
- eventmachine (1.2.7)
excon (0.90.0)
execjs (2.8.1)
expression_parser (0.9.0)
@@ -1348,10 +1346,6 @@ GEM
test_file_finder (0.1.4)
faraday (~> 1.0)
text (1.3.1)
- thin (1.8.0)
- daemons (~> 1.0, >= 1.0.9)
- eventmachine (~> 1.0, >= 1.0.4)
- rack (>= 1, < 3)
thor (1.2.1)
thrift (0.14.0)
tilt (2.0.10)
@@ -1744,7 +1738,6 @@ DEPENDENCIES
terser (= 1.0.2)
test-prof (~> 1.0.7)
test_file_finder (~> 0.1.3)
- thin (~> 1.8.0)
thrift (>= 0.14.0)
timecop (~> 0.9.1)
timfel-krb5-auth (~> 0.8)
diff --git a/doc/development/caching.md b/doc/development/caching.md
index 362e4c4cded63..5ae6484436e47 100644
--- a/doc/development/caching.md
+++ b/doc/development/caching.md
@@ -118,8 +118,8 @@ Is the cache being added "worthy"? This can be hard to measure, but you can cons
- `tail -f log/development.log | grep "Rendered "`
- After you're looking in the right place:
- Remove or comment out sections of code until you find the cause.
- - Use `binding.pry` to poke about in live requests. This requires a foreground
- web process like [Thin](https://gitlab.com/gitlab-org/gitlab-development-kit/-/blob/main/doc/howto/pry.md).
+ - Use `binding.pry` to poke about in live requests. This requires a
+ [foreground web process](https://gitlab.com/gitlab-org/gitlab-development-kit/-/blob/main/doc/howto/pry.md).
#### Verification
--
GitLab