diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index 06ea9410c0a1d47c6c24328f29a19bbc205754fb..c89dc0ab13f74ae8695c7fe0e31c5c171bc1ec1f 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -8,7 +8,7 @@ .minimal-bundle-install: 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 .base-script: diff --git a/Gemfile b/Gemfile index 67cb2aa6496be8ed867fe65f5dc021c667d4531b..e97348f17e88e1aacda464e234f59e700387815a 100644 --- a/Gemfile +++ b/Gemfile @@ -183,10 +183,6 @@ gem 'rack', '~> 2.2.3' # https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base' -group :unicorn do - gem 'unicorn', '~> 5.5' -end - group :puma do gem 'puma', '~> 5.3.1', require: false gem 'puma_worker_killer', '~> 0.3.1', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 6e5f7edfd736f9eb4cc46c24f609a452a4231f1f..59cbd84a3e60815096c40b2cf6383f47078f2971 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -682,7 +682,6 @@ GEM activerecord kaminari-core (= 1.2.1) kaminari-core (1.2.1) - kgio (2.11.3) knapsack (1.21.1) rake kramdown (2.3.1) @@ -1001,7 +1000,6 @@ GEM rake (>= 0.8.7) thor (~> 1.0) rainbow (3.0.0) - raindrops (0.19.1) rake (13.0.3) rb-fsevent (0.10.4) rb-inotify (0.10.1) @@ -1319,9 +1317,6 @@ GEM unf_ext (0.0.7.7) unicode-display_width (1.7.0) unicode_utils (1.4.0) - unicorn (5.5.5) - kgio (~> 2.6) - raindrops (~> 0.7) uniform_notifier (1.13.0) unleash (0.1.5) murmurhash3 (~> 0.1.6) @@ -1653,7 +1648,6 @@ DEPENDENCIES truncato (~> 0.7.11) u2f (~> 0.2.1) unf (~> 0.1.4) - unicorn (~> 5.5) unleash (~> 0.1.5) valid_email (~> 0.1) validates_hostname (~> 1.0.11) diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml index d76dd8fe25b82236ced518ca0e852cef4c55c762..573286a4c112a03f5e4674c3c5a6460250cc76c1 100644 --- a/config/dependency_decisions.yml +++ b/config/dependency_decisions.yml @@ -123,13 +123,6 @@ :why: https://github.com/minad/creole#license :versions: [] :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 - unf - BSD