diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-06-01 17:41:19 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-06-01 17:41:19 +0000 |
| commit | 3d3c9c75aa6078d3f3dcd8ba1399a0e6f64a26c1 (patch) | |
| tree | aed040a63127078f4fe2cf58166390e18aecc848 | |
| parent | 164fc34eb2268aff648b688a782ac1ffdaf31c42 (diff) | |
| parent | face87b7bb3af2188fd42f47fa0d43d46dafbc78 (diff) | |
| download | gitlab-ce-3d3c9c75aa6078d3f3dcd8ba1399a0e6f64a26c1.tar.gz | |
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
| -rw-r--r-- | .rubocop.yml | 2 | ||||
| -rw-r--r-- | app/models/network/graph.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/middleware/go.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index d9c253ba1ef..84a8015b410 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -514,7 +514,7 @@ Style/SelfAssignment: # Don't use semicolons to terminate expressions. Style/Semicolon: - Enabled: false + Enabled: true # Checks for proper usage of fail and raise. Style/SignalException: diff --git a/app/models/network/graph.rb b/app/models/network/graph.rb index 7f3387f87e2..a2aee2f925b 100644 --- a/app/models/network/graph.rb +++ b/app/models/network/graph.rb @@ -164,7 +164,7 @@ module Network i != range.last && @commits[i].spaces.include?(overlap_space) - return true; + return true end end diff --git a/lib/gitlab/middleware/go.rb b/lib/gitlab/middleware/go.rb index 50b0dd32380..5764ab15652 100644 --- a/lib/gitlab/middleware/go.rb +++ b/lib/gitlab/middleware/go.rb @@ -39,7 +39,7 @@ module Gitlab request_url = URI.join(base_url, project_path) 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 def strip_url(url) |