Commit 8cb7759b authored by Robert Speicher's avatar Robert Speicher

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
parents c61cf41d 1707e89c
...@@ -222,7 +222,7 @@ Style/EndBlock: ...@@ -222,7 +222,7 @@ Style/EndBlock:
# Use Unix-style line endings. # Use Unix-style line endings.
Style/EndOfLine: Style/EndOfLine:
Enabled: false Enabled: true
# Favor the use of Fixnum#even? && Fixnum#odd? # Favor the use of Fixnum#even? && Fixnum#odd?
Style/EvenOdd: Style/EvenOdd:
......
# Controller for viewing a repository's file structure # Controller for viewing a repository's file structure
class Projects::FindFileController < Projects::ApplicationController class Projects::FindFileController < Projects::ApplicationController
include ExtractsPath include ExtractsPath
include ActionView::Helpers::SanitizeHelper include ActionView::Helpers::SanitizeHelper
include TreeHelper include TreeHelper
before_action :require_non_empty_project before_action :require_non_empty_project
before_action :assign_ref_vars before_action :assign_ref_vars
before_action :authorize_download_code! before_action :authorize_download_code!
def show def show
return render_404 unless @repository.commit(@ref) return render_404 unless @repository.commit(@ref)
respond_to do |format| respond_to do |format|
format.html format.html
end end
end end
def list def list
file_paths = @repo.ls_files(@ref) file_paths = @repo.ls_files(@ref)
respond_to do |format| respond_to do |format|
format.json { render json: file_paths } format.json { render json: file_paths }
end end
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment