summaryrefslogtreecommitdiff
path: root/.rubocop.yml
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-05-30 17:27:48 +0000
committerRobert Speicher <robert@gitlab.com>2016-05-30 17:27:48 +0000
commit8cb7759b92685f8dc40c7829eb1114f55eee5271 (patch)
tree9a3608441e41404944f3d099765cdcde46f8ced7 /.rubocop.yml
parentc61cf41defd4c1e44d519bedc2f9648d6554f5d2 (diff)
parent1707e89c2969a5bf85836fb9f55079f5c29f3b0f (diff)
downloadgitlab-ce-8cb7759b92685f8dc40c7829eb1114f55eee5271.tar.gz
Merge branch 'style/enable-rubocop-end-of-line-cop' into 'master'
Enable Style/EndOfLine Rubocop style cop Use Unix-style line endings. Removed carriage return character from end of each line in `app/controllers/projects/find_file_controller.rb` See #17478 See merge request !4347
Diffstat (limited to '.rubocop.yml')
-rw-r--r--.rubocop.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 966793f792c..9074dcff1f4 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -222,7 +222,7 @@ Style/EndBlock:
# Use Unix-style line endings.
Style/EndOfLine:
- Enabled: false
+ Enabled: true
# Favor the use of Fixnum#even? && Fixnum#odd?
Style/EvenOdd: