Commit 3d3c9c75 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'style/enable-semicolon-rubocop-cop' into 'master'

Enable Style/Semicolon rubocop style cop

Don't use semicolons to terminate expressions.

See #17478.

See merge request !4351
parents 164fc34e face87b7
...@@ -514,7 +514,7 @@ Style/SelfAssignment: ...@@ -514,7 +514,7 @@ Style/SelfAssignment:
# Don't use semicolons to terminate expressions. # Don't use semicolons to terminate expressions.
Style/Semicolon: Style/Semicolon:
Enabled: false Enabled: true
# Checks for proper usage of fail and raise. # Checks for proper usage of fail and raise.
Style/SignalException: Style/SignalException:
......
...@@ -164,7 +164,7 @@ module Network ...@@ -164,7 +164,7 @@ module Network
i != range.last && i != range.last &&
@commits[i].spaces.include?(overlap_space) @commits[i].spaces.include?(overlap_space)
return true; return true
end end
end end
......
...@@ -39,7 +39,7 @@ module Gitlab ...@@ -39,7 +39,7 @@ module Gitlab
request_url = URI.join(base_url, project_path) request_url = URI.join(base_url, project_path)
domain_path = strip_url(request_url.to_s) domain_path = strip_url(request_url.to_s)
"<!DOCTYPE html><html><head><meta content='#{domain_path} git #{request_url}.git' name='go-import'></head></html>\n"; "<!DOCTYPE html><html><head><meta content='#{domain_path} git #{request_url}.git' name='go-import'></head></html>\n"
end end
def strip_url(url) def strip_url(url)
......
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