mirror of
https://github.com/discourse/discourse.git
synced 2024-11-22 12:42:16 +08:00
DEV: flag MRI specific gems
byebug, ruby-prof, better_errors and rbtrace are very MRI specific, flag them as such This helps move forward on potential jruby and truffleruby experiments
This commit is contained in:
parent
ca9a5b8458
commit
59a7afbde9
6
Gemfile
6
Gemfile
|
@ -178,16 +178,16 @@ group :test, :development do
|
|||
gem 'shoulda-matchers', require: false
|
||||
gem 'rspec-html-matchers'
|
||||
gem 'pry-nav'
|
||||
gem 'byebug', require: ENV['RM_INFO'].nil?
|
||||
gem 'byebug', require: ENV['RM_INFO'].nil?, platform: :mri
|
||||
gem 'rubocop', require: false
|
||||
gem "rubocop-discourse", require: false
|
||||
gem 'parallel_tests'
|
||||
end
|
||||
|
||||
group :development do
|
||||
gem 'ruby-prof', require: false
|
||||
gem 'ruby-prof', require: false, platform: :mri
|
||||
gem 'bullet', require: !!ENV['BULLET']
|
||||
gem 'better_errors'
|
||||
gem 'better_errors', platform: :mri
|
||||
gem 'binding_of_caller'
|
||||
gem 'yaml-lint'
|
||||
gem 'annotate'
|
||||
|
|
|
@ -39,11 +39,13 @@ Discourse::Application.configure do
|
|||
|
||||
config.log_level = ENV['DISCOURSE_DEV_LOG_LEVEL'] if ENV['DISCOURSE_DEV_LOG_LEVEL']
|
||||
|
||||
BetterErrors::Middleware.allow_ip! ENV['TRUSTED_IP'] if ENV['TRUSTED_IP']
|
||||
if defined?(BetterErrors)
|
||||
BetterErrors::Middleware.allow_ip! ENV['TRUSTED_IP'] if ENV['TRUSTED_IP']
|
||||
|
||||
if defined?(Unicorn) && ENV["UNICORN_WORKERS"].to_i != 1
|
||||
# BetterErrors doesn't work with multiple unicorn workers. Disable it to avoid confusion
|
||||
Rails.configuration.middleware.delete BetterErrors::Middleware
|
||||
if defined?(Unicorn) && ENV["UNICORN_WORKERS"].to_i != 1
|
||||
# BetterErrors doesn't work with multiple unicorn workers. Disable it to avoid confusion
|
||||
Rails.configuration.middleware.delete BetterErrors::Middleware
|
||||
end
|
||||
end
|
||||
|
||||
config.load_mini_profiler = true
|
||||
|
@ -57,7 +59,9 @@ Discourse::Application.configure do
|
|||
config.middleware.insert 1, Middleware::MissingAvatars
|
||||
|
||||
config.enable_anon_caching = false
|
||||
require 'rbtrace'
|
||||
if RUBY_ENGINE == "ruby"
|
||||
require 'rbtrace'
|
||||
end
|
||||
|
||||
if emails = GlobalSetting.developer_emails
|
||||
config.developer_emails = emails.split(",").map(&:downcase).map(&:strip)
|
||||
|
|
Loading…
Reference in New Issue
Block a user