From 64838a3ac9ad302e366ca8f3e7ab47434c8e4d81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0smail=20Akbudak?= Date: Tue, 9 Jan 2018 12:56:09 +0300 Subject: [PATCH] KBP-175 #time 30m fix rails console warnings --- lib/cybele/helpers/app_files/assets_files.rb | 12 ++++++------ .../{application.css.sass => application.sass} | 0 .../hq/{_sidebar.css.sass => _sidebar.sass} | 3 +-- .../hq/{application.css.sass => application.sass} | 0 templates/devise/devise_strong_parameter.rb.erb | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) rename templates/app_files/app/assets/stylesheets/{application.css.sass => application.sass} (100%) rename templates/app_files/app/assets/stylesheets/hq/{_sidebar.css.sass => _sidebar.sass} (96%) rename templates/app_files/app/assets/stylesheets/hq/{application.css.sass => application.sass} (100%) diff --git a/lib/cybele/helpers/app_files/assets_files.rb b/lib/cybele/helpers/app_files/assets_files.rb index aa9ca55..0cc7b1e 100644 --- a/lib/cybele/helpers/app_files/assets_files.rb +++ b/lib/cybele/helpers/app_files/assets_files.rb @@ -26,16 +26,16 @@ def stylesheet_files # Css Assets files remove_file 'app/assets/stylesheets/application.css', force: true - template 'app_files/app/assets/stylesheets/application.css.sass', - 'app/assets/stylesheets/application.css.sass', + template 'app_files/app/assets/stylesheets/application.sass', + 'app/assets/stylesheets/application.sass', force: true - template 'app_files/app/assets/stylesheets/hq/application.css.sass', - 'app/assets/stylesheets/hq/application.css.sass', + template 'app_files/app/assets/stylesheets/hq/application.sass', + 'app/assets/stylesheets/hq/application.sass', force: true - copy_file 'app_files/app/assets/stylesheets/hq/_sidebar.css.sass', - 'app/assets/stylesheets/hq/_sidebar.css.sass' + copy_file 'app_files/app/assets/stylesheets/hq/_sidebar.sass', + 'app/assets/stylesheets/hq/_sidebar.sass' end end end diff --git a/templates/app_files/app/assets/stylesheets/application.css.sass b/templates/app_files/app/assets/stylesheets/application.sass similarity index 100% rename from templates/app_files/app/assets/stylesheets/application.css.sass rename to templates/app_files/app/assets/stylesheets/application.sass diff --git a/templates/app_files/app/assets/stylesheets/hq/_sidebar.css.sass b/templates/app_files/app/assets/stylesheets/hq/_sidebar.sass similarity index 96% rename from templates/app_files/app/assets/stylesheets/hq/_sidebar.css.sass rename to templates/app_files/app/assets/stylesheets/hq/_sidebar.sass index e06d3e9..41c8a28 100644 --- a/templates/app_files/app/assets/stylesheets/hq/_sidebar.css.sass +++ b/templates/app_files/app/assets/stylesheets/hq/_sidebar.sass @@ -34,8 +34,7 @@ padding-left: 5px .collapse .list-group-item, .collapsing .list-group-item padding-left: 20px - .collapse > - .collapse .list-group-item, .collapsing .list-group-item + .collapse > .collapse .list-group-item, .collapsing .list-group-item padding-left: 1.25rem .collapse > .collapse .list-group-item padding-left: 40px diff --git a/templates/app_files/app/assets/stylesheets/hq/application.css.sass b/templates/app_files/app/assets/stylesheets/hq/application.sass similarity index 100% rename from templates/app_files/app/assets/stylesheets/hq/application.css.sass rename to templates/app_files/app/assets/stylesheets/hq/application.sass diff --git a/templates/devise/devise_strong_parameter.rb.erb b/templates/devise/devise_strong_parameter.rb.erb index e770a94..947bcde 100644 --- a/templates/devise/devise_strong_parameter.rb.erb +++ b/templates/devise/devise_strong_parameter.rb.erb @@ -1,7 +1,7 @@ def configure_devise_permitted_parameters - sign_up_attributes = %i[email password password_confirmation name surname] + sign_up_attributes = %i[email password password_confirmation name surname time_zone] sign_in_attributes = %i[email password password_confirmation current_password] if resource_class == User devise_parameter_sanitizer.permit(:sign_up, keys: sign_up_attributes)