github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 09:42:07 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

remove conditional support for ruby 2.0

Browse Source
This commit is contained in:
Sam Saffron 2016-12-29 16:32:23 +11:00
parent 65c40feb32
commit 920050c3ec
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Gemfile
View File

@ -164,7 +164,6 @@ gem 'htmlentities', require: false
# If you want to amend mini profiler to do the monkey patches in the railties # 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 # 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 'flamegraph', require: false
gem 'rack-mini-profiler', 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 'ruby-readability', require: false
gem 'simple-rss', require: false gem 'simple-rss', require: false
gem 'stackprof', require: false, platform: :mri
begin gem 'memory_profiler', require: false, platform: :mri
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 'rmmseg-cpp', require: false gem 'rmmseg-cpp', require: false

2
Gemfile.lock
View File

@ -103,7 +103,6 @@ GEM
faraday (0.9.2) faraday (0.9.2)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
fast_blank (1.0.0) fast_blank (1.0.0)
fast_stack (0.2.0)
fast_xor (1.1.3) fast_xor (1.1.3)
rake rake
rake-compiler rake-compiler
@ -407,7 +406,6 @@ DEPENDENCIES
fabrication (= 2.9.8) fabrication (= 2.9.8)
fakeweb (~> 1.3.0) fakeweb (~> 1.3.0)
fast_blank fast_blank
fast_stack
fast_xor fast_xor
fast_xs fast_xs
flamegraph flamegraph