Commit 6af841ba authored by Vitaly Slobodin's avatar Vitaly Slobodin

Merge branch 'tnir/Layout/SpaceAfterComma' into 'master'

Enable Layout/SpaceAfterColon cop for HAML

See merge request gitlab-org/gitlab!58731
parents 523333da 74fce67a
...@@ -111,7 +111,6 @@ linters: ...@@ -111,7 +111,6 @@ linters:
- Layout/EmptyLineAfterGuardClause - Layout/EmptyLineAfterGuardClause
- Layout/LeadingCommentSpace - Layout/LeadingCommentSpace
- Layout/SpaceAfterColon - Layout/SpaceAfterColon
- Layout/SpaceAfterComma
- Layout/SpaceAroundOperators - Layout/SpaceAroundOperators
- Layout/SpaceBeforeBlockBraces - Layout/SpaceBeforeBlockBraces
- Layout/SpaceBeforeComma - Layout/SpaceBeforeComma
......
...@@ -5,4 +5,4 @@ ...@@ -5,4 +5,4 @@
= render 'shared/ref_switcher', destination: 'graphs' = render 'shared/ref_switcher', destination: 'graphs'
= link_to s_('Commits|History'), project_commits_path(@project, current_ref), class: 'btn gl-button btn-default' = link_to s_('Commits|History'), project_commits_path(@project, current_ref), class: 'btn gl-button btn-default'
.js-contributors-graph{ class: container_class, 'data-project-graph-path': project_graph_path(@project, current_ref, format: :json),'data-project-branch': current_ref } .js-contributors-graph{ class: container_class, 'data-project-graph-path': project_graph_path(@project, current_ref, format: :json), 'data-project-branch': current_ref }
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
%h5 Request headers: %h5 Request headers:
%pre %pre
- hook_log.request_headers.each do |k,v| - hook_log.request_headers.each do |k, v|
<strong>#{k}:</strong> #{v} <strong>#{k}:</strong> #{v}
%br %br
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#{Gitlab::Json.pretty_generate(hook_log.request_data)} #{Gitlab::Json.pretty_generate(hook_log.request_data)}
%h5 Response headers: %h5 Response headers:
%pre %pre
- hook_log.response_headers.each do |k,v| - hook_log.response_headers.each do |k, v|
<strong>#{k}:</strong> #{v} <strong>#{k}:</strong> #{v}
%br %br
......
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