From f82d6fa686acbb68223ac5dc7e8bceb458e81fdb Mon Sep 17 00:00:00 2001 From: r888888888 Date: Tue, 30 Jan 2018 11:04:50 -0800 Subject: [PATCH] fixes #3512 --- .ruby-version | 2 +- Gemfile | 1 - Gemfile.lock | 4 +--- config.ru | 3 --- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.ruby-version b/.ruby-version index a6254504e..fad066f80 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.3.1 \ No newline at end of file +2.5.0 \ No newline at end of file diff --git a/Gemfile b/Gemfile index bc74f6aaa..7ebff38a5 100644 --- a/Gemfile +++ b/Gemfile @@ -60,7 +60,6 @@ end group :production do gem 'unicorn-worker-killer' gem 'newrelic_rpm' - gem 'gctools', :platforms => :ruby gem 'capistrano-deploytags', '~> 1.0.0', require: false end diff --git a/Gemfile.lock b/Gemfile.lock index cc5d83636..b7c4ea5ab 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -130,7 +130,6 @@ GEM ffaker (2.8.1) ffi (1.9.18) ffi (1.9.18-x64-mingw32) - gctools (0.2.4) get_process_mem (0.2.1) globalid (0.4.1) activesupport (>= 4.2.0) @@ -424,7 +423,6 @@ DEPENDENCIES dtext_rb! factory_girl ffaker - gctools google-api-client highline httparty @@ -471,4 +469,4 @@ DEPENDENCIES whenever BUNDLED WITH - 1.16.0 + 1.16.1 diff --git a/config.ru b/config.ru index 9ff388a19..5aeb3fac7 100644 --- a/config.ru +++ b/config.ru @@ -11,9 +11,6 @@ if defined?(Unicorn) && Rails.env.production? # Max memory size (RSS) per worker #use Unicorn::WorkerKiller::Oom, (192*(1024**2)), (256*(1024**2)) - - require 'gctools/oobgc' - use GC::OOB::UnicornMiddleware end run Rails.application