From b7dfe2ae4054aa40e15182fd3c6cb7dd39f131db Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Fri, 13 Sep 2019 13:26:31 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 app/controllers/groups_controller.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'app/controllers/groups_controller.rb')

diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 886d1f99d69..95a7876a055 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -133,7 +133,7 @@ class GroupsController < Groups::ApplicationController
   protected
 
   def render_show_html
-    render 'groups/show'
+    render 'groups/show', locals: { trial: params[:trial] }
   end
 
   def render_details_html
@@ -229,3 +229,5 @@ class GroupsController < Groups::ApplicationController
     url_for(safe_params)
   end
 end
+
+GroupsController.prepend_if_ee('EE::GroupsController')
-- 
cgit v1.2.3