summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-05-30 11:55:00 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-06-01 08:45:14 +0200
commitface87b7bb3af2188fd42f47fa0d43d46dafbc78 (patch)
tree64c177f50a2c97311a375a9a05504a5737c0202c
parent473ea1e974cf07751601904b882de9ee2b3d0618 (diff)
downloadgitlab-ce-face87b7bb3af2188fd42f47fa0d43d46dafbc78.tar.gz
Enable Style/Semicolon rubocop style copstyle/enable-semicolon-rubocop-cop
See #17478
-rw-r--r--.rubocop.yml2
-rw-r--r--app/models/network/graph.rb2
-rw-r--r--lib/gitlab/middleware/go.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index eece9ec69d8..784697aaaa8 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 1ac37e0307f..39ffb2d8f8b 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)