diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-02-13 18:05:14 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-02-13 18:05:14 +0000 |
| commit | 122ffd9fc799ab9a99cc555e4a82b68bcffabb0f (patch) | |
| tree | 4f93eced7b6fd9b7af6114c6529205c88ebe72e4 /lib | |
| parent | da8577675843ea01e183bf07a635386e94514665 (diff) | |
| parent | 17c8d15b14f6c3ecc98e1466e9148cf100cc12c6 (diff) | |
| download | gitlab-ce-122ffd9fc799ab9a99cc555e4a82b68bcffabb0f.tar.gz | |
Merge branch 'rs-rubocop-rspec' into 'master'
Enable Style/RedundantException, Lint/EmptyWhen, and RSpec/ExpectActual cops
See merge request !9151
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/diff/parser.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/diff/parser.rb b/lib/gitlab/diff/parser.rb index 59a2367b65d..89320f5d9dc 100644 --- a/lib/gitlab/diff/parser.rb +++ b/lib/gitlab/diff/parser.rb @@ -45,7 +45,7 @@ module Gitlab line_new += 1 when "-" line_old += 1 - when "\\" + when "\\" # rubocop:disable Lint/EmptyWhen # No increment else line_new += 1 |