Merge branch 'tnir/rubocop-Style/Semicolon-foss' into 'master'

Enable Style/Semicolon in Rubocop for HAML

See merge request gitlab-org/gitlab!59070

.haml-lint.yml

@@ -137,7 +137,6 @@ linters:
       - Style/ParenthesesAroundCondition
       - Style/RedundantParentheses
       - Style/SelfAssignment
-      - Style/Semicolon
       - Style/TernaryParentheses
       - Style/TrailingCommaInHashLiteral
       - Style/UnlessElse

app/views/layouts/_flash.html.haml

 -# We currently only support `alert`, `notice`, `success`, 'toast'
-- icons = {'alert' => 'error', 'notice' => 'information-o', 'success' => 'check-circle'};
+- icons = {'alert' => 'error', 'notice' => 'information-o', 'success' => 'check-circle'}
 .flash-container.flash-container-page.sticky{ data: { qa_selector: 'flash_container' } }
   - flash.each do |key, value|
     - if key == 'toast' && value

app/views/shared/blob/_markdown_buttons.html.haml

-- modifier_key = client_js_flags[:isMac] ? '⌘' : s_('KeyboardKey|Ctrl+');
+- modifier_key = client_js_flags[:isMac] ? '⌘' : s_('KeyboardKey|Ctrl+')
 
 .md-header-toolbar.active
   = markdown_toolbar_button({ icon: "bold",