Merge branch 'tnir/rubocop-Style/AndOr-Style/Not' into 'master'

Enable Style/AndOr and Style/Not in Rubocop for HAML

See merge request gitlab-org/gitlab!59071

.haml-lint.yml

@@ -129,14 +129,12 @@ linters:
       - Rails/LinkToBlank
       - Rails/Presence
       - Rails/RequestReferer
-      - Style/AndOr
       - Style/ColonMethodCall
       - Style/ConditionalAssignment
       - Style/HashSyntax
       - Style/IdenticalConditionalBranches
       - Style/NegatedIf
       - Style/NestedTernaryOperator
-      - Style/Not
       - Style/ParenthesesAroundCondition
       - Style/RedundantParentheses
       - Style/SelfAssignment

app/views/shared/_milestone_expired.html.haml

-- if milestone.expired? and not milestone.closed?
+- if milestone.expired? && !milestone.closed?
   .gl-badge.badge-warning.badge-pill.gl-mb-2= _('Expired')
 - if milestone.upcoming?
   .gl-badge.badge-primary.badge-pill.gl-mb-2= _('Upcoming')

app/views/shared/empty_states/_profile_tabs.html.haml

@@ -6,7 +6,7 @@
   .svg-content
     = image_tag illustration_path, size: '75'
     .text-content
-      - if user_profile? and current_user.present? and current_user.username == params[:username]
+      - if user_profile? && current_user.present? && current_user.username == params[:username]
         %h5= current_user_empty_message_header
 
         - if current_user_empty_message_description.present?