From 2113266e51f28d437e48085d269a1aaa12a1bb0d Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Mon, 15 Jan 2018 12:43:07 +1100
Subject: [PATCH] Simplify complex conditional, add frozen strings

---
 config/application.rb | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

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