diff --git a/app/controllers/concerns/with_locale.rb b/app/controllers/application_controller/with_locale.rb similarity index 86% rename from app/controllers/concerns/with_locale.rb rename to app/controllers/application_controller/with_locale.rb index 2cd9cf96620e63dd47d19fb366e5abedcf0e041d..196d8cac221cda9eb75b4c8158d161ffa273d69f 100644 --- a/app/controllers/concerns/with_locale.rb +++ b/app/controllers/application_controller/with_locale.rb @@ -1,4 +1,4 @@ -module WithLocale +module ApplicationController::WithLocale extend ActiveSupport::Concern included do diff --git a/app/controllers/users/confirmations_controller.rb b/app/controllers/users/confirmations_controller.rb index 1973515dbaa702a14eaa59bca75f78c30350fe72..98000946ca7f1a503698e6bcf0d278fe7c90f399 100644 --- a/app/controllers/users/confirmations_controller.rb +++ b/app/controllers/users/confirmations_controller.rb @@ -1,4 +1,3 @@ class Users::ConfirmationsController < Devise::ConfirmationsController - include WithLocale include Users::AddUniversityToRequestParams end diff --git a/app/controllers/users/passwords_controller.rb b/app/controllers/users/passwords_controller.rb index 2b7aeb3f6c5072bea120ed6cec993dd834b9e8cb..c0334ec485bd903f30bf6324a25e1b245ffd4c2e 100644 --- a/app/controllers/users/passwords_controller.rb +++ b/app/controllers/users/passwords_controller.rb @@ -1,5 +1,4 @@ class Users::PasswordsController < Devise::PasswordsController - include WithLocale include Users::AddUniversityToRequestParams def update diff --git a/app/controllers/users/registrations_controller.rb b/app/controllers/users/registrations_controller.rb index 956f47bb34ead5bd590bd11977a86bbef7e059da..4e22f2bc2836ec5e89fcc8ca944ee2f9a3034174 100644 --- a/app/controllers/users/registrations_controller.rb +++ b/app/controllers/users/registrations_controller.rb @@ -1,5 +1,4 @@ class Users::RegistrationsController < Devise::RegistrationsController - include WithLocale include Users::AddUniversityToRequestParams layout 'admin/layouts/application', only: [:edit, :update] diff --git a/app/controllers/users/sessions_controller.rb b/app/controllers/users/sessions_controller.rb index d3f90dc37993e20958c95b218ebc8e32b905f571..2e9ca5a51e4a81a89046a7db59cb262b5e7c66fa 100644 --- a/app/controllers/users/sessions_controller.rb +++ b/app/controllers/users/sessions_controller.rb @@ -1,4 +1,3 @@ class Users::SessionsController < Devise::SessionsController - include WithLocale include Users::AddUniversityToRequestParams end diff --git a/app/controllers/users/two_factor_authentication_controller.rb b/app/controllers/users/two_factor_authentication_controller.rb index f963cf2620f9cd6d6ad493f6f392cf329c402283..1ab0e9e273a370736fb50634cba2a345a857061f 100644 --- a/app/controllers/users/two_factor_authentication_controller.rb +++ b/app/controllers/users/two_factor_authentication_controller.rb @@ -1,3 +1,2 @@ class Users::TwoFactorAuthenticationController < Devise::TwoFactorAuthenticationController - include WithLocale end diff --git a/app/controllers/users/unlocks_controller.rb b/app/controllers/users/unlocks_controller.rb index 3024277aa71f58e146f024b1bc6f7dce55a5736f..b1ef889214da83bd699990b4c1110d132a004626 100644 --- a/app/controllers/users/unlocks_controller.rb +++ b/app/controllers/users/unlocks_controller.rb @@ -1,4 +1,3 @@ class Users::UnlocksController < Devise::UnlocksController - include WithLocale include Users::AddUniversityToRequestParams end