From cf235fbd48eab2c9b366f47ca3fb4e99df1ce552 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Thu, 2 May 2019 13:24:30 +0800
Subject: [PATCH] Fix bundler not requiring default group. Follow up to
 a2babcafd8264c94ebcc03d5237b2daf328d4e3e.

---
 config/application.rb | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/config/application.rb b/config/application.rb
index 8f69e56f37f..f110b6505cb 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -37,8 +37,16 @@ GlobalSetting.load_defaults
 
 require 'pry-rails' if Rails.env.development?
 
-if defined?(Bundler) && !Rails.env.production?
-  Bundler.require(*Rails.groups(assets: %w(development test profile)))
+if defined?(Bundler)
+  bundler_groups = [:default]
+
+  if !Rails.env.production?
+    bundler_groups = bundler_groups.concat(Rails.groups(
+      assets: %w(development test profile)
+    ))
+  end
+
+  Bundler.require(*bundler_groups)
 end
 
 module Discourse