From 920050c3ec983f3f81bd367f9089b421124a52f7 Mon Sep 17 00:00:00 2001 From: Sam Saffron Date: Thu, 29 Dec 2016 16:32:23 +1100 Subject: [PATCH] remove conditional support for ruby 2.0 --- Gemfile | 17 ++--------------- Gemfile.lock | 2 -- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/Gemfile b/Gemfile index 136b9248836..a0a84196212 100644 --- a/Gemfile +++ b/Gemfile @@ -164,7 +164,6 @@ gem 'htmlentities', require: false # If you want to amend mini profiler to do the monkey patches in the railties # we are open to it. by deferring require to the initializer we can configure discourse installs without it -gem 'fast_stack', require: false, platform: [:mri_20] gem 'flamegraph', require: false gem 'rack-mini-profiler', require: false @@ -178,20 +177,8 @@ gem 'gc_tracer', require: false, platform: :mri gem 'ruby-readability', require: false gem 'simple-rss', require: false - -begin - gem 'stackprof', require: false, platform: [:mri_21, :mri_22, :mri_23] - gem 'memory_profiler', require: false, platform: [:mri_21, :mri_22, :mri_23] -rescue Bundler::GemfileError - begin - STDERR.puts "You are running an old version of bundler, please upgrade bundler ASAP, if you are using Discourse docker, rebuild your container." - gem 'stackprof', require: false, platform: [:mri_21, :mri_22] - gem 'memory_profiler', require: false, platform: [:mri_21, :mri_22] - rescue Bundler::GemfileError - gem 'stackprof', require: false, platform: [:mri_21] - gem 'memory_profiler', require: false, platform: [:mri_21] - end -end +gem 'stackprof', require: false, platform: :mri +gem 'memory_profiler', require: false, platform: :mri gem 'rmmseg-cpp', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 5914ace415c..2329fd636bf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -103,7 +103,6 @@ GEM faraday (0.9.2) multipart-post (>= 1.2, < 3) fast_blank (1.0.0) - fast_stack (0.2.0) fast_xor (1.1.3) rake rake-compiler @@ -407,7 +406,6 @@ DEPENDENCIES fabrication (= 2.9.8) fakeweb (~> 1.3.0) fast_blank - fast_stack fast_xor fast_xs flamegraph