Merge branch 'master' of https://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

app/views/admin/dashboard/index.html.erb

 <% content_for :title, t('admin.dashboard') %>
-<% classes = 'col-md-6 col-xl-4 col-xxl-3 d-flex' %>
+<% classes = 'col-md-6 col-xl-4 d-flex' %>
 
 <div class="row">
-  <div class="<%= classes %>">
+  <div class="col-md-6 d-flex">
     <div class="card flex-fill">
       <div class="card-body">
         <h4><%= t('hello', name: current_user.first_name) %></h4>
@@ -14,7 +14,7 @@
       </div>
     </div>
   </div>
-  <div class="<%= classes %>">
+  <div class="col-md-6 d-flex">
     <div class="card flex-fill">
       <div class="card-body py-4">
         <div class="d-flex align-items-start">