diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
| commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
| tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /app/controllers/oauth/applications_controller.rb | |
| parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) | |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'app/controllers/oauth/applications_controller.rb')
| -rw-r--r-- | app/controllers/oauth/applications_controller.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/controllers/oauth/applications_controller.rb b/app/controllers/oauth/applications_controller.rb index 2c3e60d12b7..6532501733a 100644 --- a/app/controllers/oauth/applications_controller.rb +++ b/app/controllers/oauth/applications_controller.rb @@ -17,6 +17,8 @@ class Oauth::ApplicationsController < Doorkeeper::ApplicationsController before_action :add_gon_variables before_action :load_scopes, only: [:index, :create, :edit, :update] + around_action :set_locale + helper_method :can? layout 'profile' @@ -70,4 +72,8 @@ class Oauth::ApplicationsController < Doorkeeper::ApplicationsController params[:owner] = current_user end end + + def set_locale(&block) + Gitlab::I18n.with_user_locale(current_user, &block) + end end |