diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
tree | 5423a1c7516cffe36384133ade12572cf709398d /app/controllers/profiles | |
parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'app/controllers/profiles')
-rw-r--r-- | app/controllers/profiles/accounts_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/profiles/personal_access_tokens_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/profiles/preferences_controller.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/profiles/accounts_controller.rb b/app/controllers/profiles/accounts_controller.rb index d8419be9f23..bd52ef0b0d4 100644 --- a/app/controllers/profiles/accounts_controller.rb +++ b/app/controllers/profiles/accounts_controller.rb @@ -37,4 +37,4 @@ class Profiles::AccountsController < Profiles::ApplicationController end end -Profiles::AccountsController.prepend_if_ee('EE::Profiles::AccountsController') +Profiles::AccountsController.prepend_mod_with('Profiles::AccountsController') diff --git a/app/controllers/profiles/personal_access_tokens_controller.rb b/app/controllers/profiles/personal_access_tokens_controller.rb index 251967a7dff..ba539ef808d 100644 --- a/app/controllers/profiles/personal_access_tokens_controller.rb +++ b/app/controllers/profiles/personal_access_tokens_controller.rb @@ -60,4 +60,4 @@ class Profiles::PersonalAccessTokensController < Profiles::ApplicationController end end -Profiles::PersonalAccessTokensController.prepend_if_ee('EE::Profiles::PersonalAccessTokensController') +Profiles::PersonalAccessTokensController.prepend_mod_with('Profiles::PersonalAccessTokensController') diff --git a/app/controllers/profiles/preferences_controller.rb b/app/controllers/profiles/preferences_controller.rb index 45bab5f6cd1..adecb56ea38 100644 --- a/app/controllers/profiles/preferences_controller.rb +++ b/app/controllers/profiles/preferences_controller.rb @@ -55,4 +55,4 @@ class Profiles::PreferencesController < Profiles::ApplicationController end end -Profiles::PreferencesController.prepend_if_ee('::EE::Profiles::PreferencesController') +Profiles::PreferencesController.prepend_mod_with('Profiles::PreferencesController') |