Merge branch 'master' into bn_launcher_integration

2018-07-09 13:20:34 -04:00
parent 67c32a396f 68d61d115c
commit 590e189474
12 changed files with 52 additions and 24 deletions
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -90,6 +90,7 @@ Rails.application.configure do
  config.active_record.dump_schema_after_migration = false

  # Set the relative url root for deployment to a subdirectory.
-  config.relative_url_root = "/"
-  config.relative_url_root = ENV['RELATIVE_URL_ROOT'] if ENV['RELATIVE_URL_ROOT'].present?
+  if ENV['RELATIVE_URL_ROOT'] != "/"
+    config.relative_url_root = ENV['RELATIVE_URL_ROOT'] || "/b"
+  end
 end