Merge branch...

Merge branch '219121-resolve-the-need-for-disabling-redundant-check-in-haml-templates' into 'master'

Resolve the need for disabling redundant check in haml templates

Closes #219121

See merge request gitlab-org/gitlab!34860

app/views/admin/users/show.html.haml

@@ -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:

app/views/shared/_field.html.haml

@@ -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

locale/gitlab.pot

@@ -27428,6 +27428,9 @@ msgstr ""
 msgid "needs to be between 10 minutes and 1 month"
 msgstr ""
 
+msgid "never"
+msgstr ""
+
 msgid "never expires"
 msgstr ""