diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-26 12:06:00 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-26 12:06:00 +0000 |
| commit | 5707f305f4b961e24369fcdaecf0b8ce1c34bad8 (patch) | |
| tree | 3b291653b83b3e6c2bffc77c54527fbe6f6373be /app/controllers/application_controller.rb | |
| parent | 759cd6c2985088d187ed519f2a881c2c690b34ec (diff) | |
| download | gitlab-ce-5707f305f4b961e24369fcdaecf0b8ce1c34bad8.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 9a7859fc687..0d0384ba52f 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -36,6 +36,7 @@ class ApplicationController < ActionController::Base protect_from_forgery with: :exception, prepend: true helper_method :can? + helper_method :current_user_mode helper_method :import_sources_enabled?, :github_import_enabled?, :gitea_import_enabled?, :github_import_configured?, :gitlab_import_enabled?, :gitlab_import_configured?, @@ -533,6 +534,10 @@ class ApplicationController < ActionController::Base yield end end + + def current_user_mode + @current_user_mode ||= Gitlab::Auth::CurrentUserMode.new(current_user) + end end ApplicationController.prepend_if_ee('EE::ApplicationController') |