From 1707e89c2969a5bf85836fb9f55079f5c29f3b0f Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Mon, 30 May 2016 10:35:37 +0200 Subject: [PATCH] Enable Style/EndOfLine Rubocop style cop Use Unix-style line endings. See #17478. --- .rubocop.yml | 2 +- .../projects/find_file_controller.rb | 52 +++++++++---------- 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