Commit 1870bd83 authored by Matthias Käppler's avatar Matthias Käppler

Merge branch '330402-remove-unicorn-gitlab' into 'master'

Remove Unicorn support: main MR [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!61888
parents 70ff7704 e2fc284c
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
.minimal-bundle-install: .minimal-bundle-install:
script: script:
- export BUNDLE_WITHOUT="${BUNDLE_WITHOUT}:default:test:puma:unicorn:kerberos:metrics:omnibus:ed25519" - export BUNDLE_WITHOUT="${BUNDLE_WITHOUT}:default:test:puma:kerberos:metrics:omnibus:ed25519"
- bundle_install_script - bundle_install_script
.base-script: .base-script:
......
...@@ -183,10 +183,6 @@ gem 'rack', '~> 2.2.3' ...@@ -183,10 +183,6 @@ gem 'rack', '~> 2.2.3'
# https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually # https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually
gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base' gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base'
group :unicorn do
gem 'unicorn', '~> 5.5'
end
group :puma do group :puma do
gem 'puma', '~> 5.3.1', require: false gem 'puma', '~> 5.3.1', require: false
gem 'puma_worker_killer', '~> 0.3.1', require: false gem 'puma_worker_killer', '~> 0.3.1', require: false
......
...@@ -682,7 +682,6 @@ GEM ...@@ -682,7 +682,6 @@ GEM
activerecord activerecord
kaminari-core (= 1.2.1) kaminari-core (= 1.2.1)
kaminari-core (1.2.1) kaminari-core (1.2.1)
kgio (2.11.3)
knapsack (1.21.1) knapsack (1.21.1)
rake rake
kramdown (2.3.1) kramdown (2.3.1)
...@@ -1001,7 +1000,6 @@ GEM ...@@ -1001,7 +1000,6 @@ GEM
rake (>= 0.8.7) rake (>= 0.8.7)
thor (~> 1.0) thor (~> 1.0)
rainbow (3.0.0) rainbow (3.0.0)
raindrops (0.19.1)
rake (13.0.3) rake (13.0.3)
rb-fsevent (0.10.4) rb-fsevent (0.10.4)
rb-inotify (0.10.1) rb-inotify (0.10.1)
...@@ -1319,9 +1317,6 @@ GEM ...@@ -1319,9 +1317,6 @@ GEM
unf_ext (0.0.7.7) unf_ext (0.0.7.7)
unicode-display_width (1.7.0) unicode-display_width (1.7.0)
unicode_utils (1.4.0) unicode_utils (1.4.0)
unicorn (5.5.5)
kgio (~> 2.6)
raindrops (~> 0.7)
uniform_notifier (1.13.0) uniform_notifier (1.13.0)
unleash (0.1.5) unleash (0.1.5)
murmurhash3 (~> 0.1.6) murmurhash3 (~> 0.1.6)
...@@ -1653,7 +1648,6 @@ DEPENDENCIES ...@@ -1653,7 +1648,6 @@ DEPENDENCIES
truncato (~> 0.7.11) truncato (~> 0.7.11)
u2f (~> 0.2.1) u2f (~> 0.2.1)
unf (~> 0.1.4) unf (~> 0.1.4)
unicorn (~> 5.5)
unleash (~> 0.1.5) unleash (~> 0.1.5)
valid_email (~> 0.1) valid_email (~> 0.1)
validates_hostname (~> 1.0.11) validates_hostname (~> 1.0.11)
......
...@@ -123,13 +123,6 @@ ...@@ -123,13 +123,6 @@
:why: https://github.com/minad/creole#license :why: https://github.com/minad/creole#license
:versions: [] :versions: []
:when: 2016-04-17 21:49:10.329759000 Z :when: 2016-04-17 21:49:10.329759000 Z
- - :license
- unicorn
- ruby
- :who: Connor Shea
:why: http://unicorn.bogomips.org/LICENSE.html
:versions: []
:when: 2016-05-02 05:45:28.817510000 Z
- - :license - - :license
- unf - unf
- BSD - BSD
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment