summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-05-30 10:35:37 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-05-30 10:35:37 +0200
commit1707e89c2969a5bf85836fb9f55079f5c29f3b0f (patch)
tree7f9da6aa6a6e344d292fe081296e8f5177fa2336
parent43c35b0f20fb3bb67ea2b96bf8f806c7e95b6aec (diff)
downloadgitlab-ce-style/enable-rubocop-end-of-line-cop.tar.gz
Enable Style/EndOfLine Rubocop style copstyle/enable-rubocop-end-of-line-cop
Use Unix-style line endings. See #17478.
-rw-r--r--.rubocop.yml2
-rw-r--r--app/controllers/projects/find_file_controller.rb52
2 files changed, 27 insertions, 27 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 2d8eb4077f3..7cf985383b6 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:
diff --git a/app/controllers/projects/find_file_controller.rb b/app/controllers/projects/find_file_controller.rb
index 54a0c447aee..cf53ad0a670 100644
--- a/app/controllers/projects/find_file_controller.rb
+++ b/app/controllers/projects/find_file_controller.rb
@@ -1,26 +1,26 @@
-# Controller for viewing a repository's file structure
-class Projects::FindFileController < Projects::ApplicationController
- include ExtractsPath
- include ActionView::Helpers::SanitizeHelper
- include TreeHelper
-
- before_action :require_non_empty_project
- before_action :assign_ref_vars
- before_action :authorize_download_code!
-
- def show
- return render_404 unless @repository.commit(@ref)
-
- respond_to do |format|
- format.html
- end
- end
-
- def list
- file_paths = @repo.ls_files(@ref)
-
- respond_to do |format|
- format.json { render json: file_paths }
- end
- end
-end
+# Controller for viewing a repository's file structure
+class Projects::FindFileController < Projects::ApplicationController
+ include ExtractsPath
+ include ActionView::Helpers::SanitizeHelper
+ include TreeHelper
+
+ before_action :require_non_empty_project
+ before_action :assign_ref_vars
+ before_action :authorize_download_code!
+
+ def show
+ return render_404 unless @repository.commit(@ref)
+
+ respond_to do |format|
+ format.html
+ end
+ end
+
+ def list
+ file_paths = @repo.ls_files(@ref)
+
+ respond_to do |format|
+ format.json { render json: file_paths }
+ end
+ end
+end