Add latest changes from gitlab-org/gitlab@master

app/controllers/application_controller.rb

@@ -534,3 +534,5 @@ class ApplicationController < ActionController::Base
     end
   end
 end
+
+ApplicationController.prepend_if_ee('EE::ApplicationController')

app/controllers/autocomplete_controller.rb

@@ -46,3 +46,5 @@ class AutocompleteController < ApplicationController
     render json: target_branches.map { |target_branch| { title: target_branch } }
   end
 end
+
+AutocompleteController.prepend_if_ee('EE::AutocompleteController')

app/controllers/boards/lists_controller.rb

@@ -87,3 +87,5 @@ module Boards
     end
   end
 end
+
+Boards::ListsController.prepend_if_ee('EE::Boards::ListsController')

app/controllers/clusters/clusters_controller.rb

@@ -244,3 +244,5 @@ class Clusters::ClustersController < Clusters::BaseController
     @cluster.applications.each(&:schedule_status_update)
   end
 end
+
+Clusters::ClustersController.prepend_if_ee('EE::Clusters::ClustersController')

app/controllers/concerns/boards_actions.rb

@@ -44,3 +44,5 @@ module BoardsActions
     serializer.represent(resource, serializer: 'board', include_full_project_path: board.group_board?)
   end
 end
+
+BoardsActions.prepend_if_ee('EE::BoardsActions')

app/controllers/concerns/boards_responses.rb

@@ -86,3 +86,5 @@ module BoardsResponses
     BoardSerializer.new
   end
 end
+
+BoardsResponses.prepend_if_ee('EE::BoardsResponses')

app/controllers/concerns/cycle_analytics_params.rb

@@ -18,3 +18,5 @@ module CycleAnalyticsParams
     end
   end
 end
+
+CycleAnalyticsParams.prepend_if_ee('EE::CycleAnalyticsParams')

app/controllers/concerns/internal_redirect.rb

@@ -45,3 +45,5 @@ module InternalRedirect
     URI(request.referer).path
   end
 end
+
+InternalRedirect.prepend_if_ee('EE::InternalRedirect')

app/controllers/concerns/issuable_actions.rb

@@ -260,3 +260,5 @@ module IssuableActions
   end
   # rubocop:enable Gitlab/ModuleWithInstanceVariables
 end
+
+IssuableActions.prepend_if_ee('EE::IssuableActions')

app/controllers/concerns/issuable_collections.rb

@@ -153,3 +153,5 @@ module IssuableCollections
   end
   # rubocop:enable Gitlab/ModuleWithInstanceVariables
 end
+
+IssuableCollections.prepend_if_ee('EE::IssuableCollections')

app/controllers/concerns/lfs_request.rb

@@ -128,3 +128,5 @@ module LfsRequest
     false
   end
 end
+
+LfsRequest.prepend_if_ee('EE::LfsRequest')

app/controllers/concerns/routable_actions.rb

@@ -55,3 +55,5 @@ module RoutableActions
     end
   end
 end
+
+RoutableActions.prepend_if_ee('EE::RoutableActions')

app/controllers/concerns/service_params.rb

@@ -85,3 +85,5 @@ module ServiceParams
     ALLOWED_PARAMS_CE
   end
 end
+
+ServiceParams.prepend_if_ee('EE::ServiceParams')

app/controllers/confirmations_controller.rb

@@ -31,3 +31,5 @@ class ConfirmationsController < Devise::ConfirmationsController
     after_sign_in_path_for(resource)
   end
 end
+
+ConfirmationsController.prepend_if_ee('EE::ConfirmationsController')

app/controllers/dashboard/projects_controller.rb

@@ -100,3 +100,5 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
     Project::SORTING_PREFERENCE_FIELD
   end
 end
+
+Dashboard::ProjectsController.prepend_if_ee('EE::Dashboard::ProjectsController')

app/controllers/groups/application_controller.rb

@@ -38,3 +38,5 @@ class Groups::ApplicationController < ApplicationController
     url_for(safe_params)
   end
 end
+
+Groups::ApplicationController.prepend_if_ee('EE::Groups::ApplicationController')

app/controllers/groups/clusters_controller.rb

@@ -18,3 +18,5 @@ class Groups::ClustersController < Clusters::ClustersController
     @group ||= find_routable!(Group, params[:group_id] || params[:id])
   end
 end
+
+Groups::ClustersController.prepend_if_ee('EE::Groups::ClustersController')

app/controllers/groups/group_members_controller.rb

@@ -53,3 +53,5 @@ class Groups::GroupMembersController < Groups::ApplicationController
   # MembershipActions concern
   alias_method :membershipable, :group
 end
+
+Groups::GroupMembersController.prepend_if_ee('EE::Groups::GroupMembersController')

app/controllers/groups/milestones_controller.rb

@@ -118,3 +118,5 @@ class Groups::MilestonesController < Groups::ApplicationController
     params.permit(:state, :search_title).merge(group_ids: group.id)
   end
 end
+
+Groups::MilestonesController.prepend_if_ee('EE::Groups::MilestonesController')

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')