Commit 9bacc3d0 authored by Doug Stull's avatar Doug Stull

Resolve redundant rubocop issues

- clean codebase as a followup from disabling.
parent 520ac5e9
......@@ -86,34 +86,22 @@
%li
%span.light Current sign-in IP:
%strong
- if @user.current_sign_in_ip # rubocop:disable Style/RedundantCondition
= @user.current_sign_in_ip
- else
never
= @user.current_sign_in_ip || _('never')
%li
%span.light Current sign-in at:
%strong
- if @user.current_sign_in_at
= @user.current_sign_in_at.to_s(:medium)
- else
never
= @user.current_sign_in_at&.to_s(:medium) || _('never')
%li
%span.light Last sign-in IP:
%strong
- if @user.last_sign_in_ip # rubocop:disable Style/RedundantCondition
= @user.last_sign_in_ip
- else
never
= @user.last_sign_in_ip || _('never')
%li
%span.light Last sign-in at:
%strong
- if @user.last_sign_in_at
= @user.last_sign_in_at.to_s(:medium)
- else
never
= @user.last_sign_in_at&.to_s(:medium) || _('never')
%li
%span.light Sign-in count:
......
......@@ -22,7 +22,7 @@
- elsif type == 'checkbox'
= form.check_box name
- elsif type == 'select'
= form.select name, options_for_select(choices, value ? value : default_choice), {}, { class: "form-control"} # rubocop:disable Style/RedundantCondition
= form.select name, options_for_select(choices, value || default_choice), {}, { class: "form-control"}
- elsif type == 'password'
= form.password_field name, autocomplete: "new-password", placeholder: placeholder, class: "form-control", required: value.blank? && required, data: { qa_selector: "#{name.downcase.gsub('\s', '')}_field" }
- if help
......
......@@ -27428,6 +27428,9 @@ msgstr ""
msgid "needs to be between 10 minutes and 1 month"
msgstr ""
msgid "never"
msgstr ""
msgid "never expires"
msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment