diff --git a/.rubocop.yml b/.rubocop.yml index 35bbd2120..47d70d453 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -490,6 +490,9 @@ Style/Proc: Style/RaiseArgs: Enabled: true +Style/RedundantArgument: + Enabled: true + Style/RedundantCondition: Enabled: true diff --git a/app/controllers/management/users_controller.rb b/app/controllers/management/users_controller.rb index b3d525be5..b349a78a4 100644 --- a/app/controllers/management/users_controller.rb +++ b/app/controllers/management/users_controller.rb @@ -47,7 +47,7 @@ class Management::UsersController < Management::BaseController end def user_without_email - new_password = "aAbcdeEfghiJkmnpqrstuUvwxyz23456789$!".split("").sample(10).join("") + new_password = "aAbcdeEfghiJkmnpqrstuUvwxyz23456789$!".split("").sample(10).join @user.password = new_password @user.password_confirmation = new_password diff --git a/app/views/admin/settings/_content_types_settings_form.html.erb b/app/views/admin/settings/_content_types_settings_form.html.erb index 67262c155..0711adbb4 100644 --- a/app/views/admin/settings/_content_types_settings_form.html.erb +++ b/app/views/admin/settings/_content_types_settings_form.html.erb @@ -6,8 +6,8 @@ <% Setting.mime_types[group].each do |content_type, mime_type_value| %> <%= check_box_tag content_type, - setting.value.split(" ").include?(mime_type_value), - setting.value.split(" ").include?(mime_type_value) %> + setting.value.split.include?(mime_type_value), + setting.value.split.include?(mime_type_value) %> <%= label_tag content_type, content_type.upcase %> <% end %>