IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Simplify complex conditional, add frozen strings

Browse Source
This commit is contained in:
Sam 2018-01-15 12:43:07 +11:00
parent 234aa68bf8
commit 2113266e51
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config/application.rb
View File

@ -1,3 +1,5 @@
# frozen_string_literal: true
require File.expand_path('../boot', __FILE__) require File.expand_path('../boot', __FILE__)
require 'rails/all' require 'rails/all'
@ -183,10 +185,13 @@ module Discourse
config.ember.handlebars_location = "#{Rails.root}/vendor/assets/javascripts/handlebars.js" config.ember.handlebars_location = "#{Rails.root}/vendor/assets/javascripts/handlebars.js"
require 'auth' require 'auth'
Discourse.activate_plugins! unless Rails.env.test? && ENV['LOAD_PLUGINS'] != "1"
if GlobalSetting.relative_url_root.present? if Rails.env == "test"
config.relative_url_root = GlobalSetting.relative_url_root if ENV['LOAD_PLUGINS'] == "1"
Discourse.activate_plugins!
end
else
Discourse.activate_plugins!
end end
require_dependency 'stylesheet/manager' require_dependency 'stylesheet/manager'