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

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
3d3c9c75 · Robert Speicher · 164fc34e · face87b7 · 3d3c9c75 · 3d3c9c75
Commit 3d3c9c75 authored Jun 01, 2016 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

.rubocop.yml .rubocop.yml +1 -1

app/models/network/graph.rb app/models/network/graph.rb +1 -1

lib/gitlab/middleware/go.rb lib/gitlab/middleware/go.rb +1 -1

No files found.
--- 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:

--- 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


--- 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)