Merge branch 'master' of github.com:noesya/osuny

app/controllers/concerns/with_locale.rb → app/controllers/application_controller/with_locale.rb

-module WithLocale
+module ApplicationController::WithLocale
   extend ActiveSupport::Concern
 
   included do

app/controllers/users/confirmations_controller.rb

 class Users::ConfirmationsController < Devise::ConfirmationsController
-  include WithLocale
   include Users::AddUniversityToRequestParams
 end

app/controllers/users/passwords_controller.rb

 class Users::PasswordsController < Devise::PasswordsController
-  include WithLocale
   include Users::AddUniversityToRequestParams
 
   def update

app/controllers/users/registrations_controller.rb

 class Users::RegistrationsController < Devise::RegistrationsController
-  include WithLocale
   include Users::AddUniversityToRequestParams
 
   layout 'admin/layouts/application', only: [:edit, :update]

app/controllers/users/sessions_controller.rb

 class Users::SessionsController < Devise::SessionsController
-  include WithLocale
   include Users::AddUniversityToRequestParams
 end

app/controllers/users/two_factor_authentication_controller.rb

 class Users::TwoFactorAuthenticationController < Devise::TwoFactorAuthenticationController
-  include WithLocale
 end

app/controllers/users/unlocks_controller.rb

 class Users::UnlocksController < Devise::UnlocksController
-  include WithLocale
   include Users::AddUniversityToRequestParams
 end