From b7dfe2ae4054aa40e15182fd3c6cb7dd39f131db Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 13 Sep 2019 13:26:31 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/controllers/profiles/accounts_controller.rb | 2 ++ app/controllers/profiles/preferences_controller.rb | 2 ++ 2 files changed, 4 insertions(+) (limited to 'app/controllers/profiles') diff --git a/app/controllers/profiles/accounts_controller.rb b/app/controllers/profiles/accounts_controller.rb index b03f4b7435f..95e055a44db 100644 --- a/app/controllers/profiles/accounts_controller.rb +++ b/app/controllers/profiles/accounts_controller.rb @@ -30,3 +30,5 @@ class Profiles::AccountsController < Profiles::ApplicationController {} end end + +Profiles::AccountsController.prepend_if_ee('EE::Profiles::AccountsController') diff --git a/app/controllers/profiles/preferences_controller.rb b/app/controllers/profiles/preferences_controller.rb index 62f98d9e549..046ae5d9a51 100644 --- a/app/controllers/profiles/preferences_controller.rb +++ b/app/controllers/profiles/preferences_controller.rb @@ -50,3 +50,5 @@ class Profiles::PreferencesController < Profiles::ApplicationController ] end end + +Profiles::PreferencesController.prepend_if_ee('::EE::Profiles::PreferencesController') -- cgit v1.2.3