summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRegis <boudinot.regis@yahoo.com>2017-05-09 17:43:04 -0600
committerRegis <boudinot.regis@yahoo.com>2017-05-09 17:43:04 -0600
commit5e734dfed5d639ccac857f971562562ac539d4ac (patch)
treecfc2d8dee86044151e30963044d038bd09a82268
parent38a7f46b2debb8eada14fec7059fe9e4c467c281 (diff)
downloadgitlab-ce-5e734dfed5d639ccac857f971562562ac539d4ac.tar.gz
remove carriage return complaints for rubocop
-rw-r--r--app/controllers/projects/branches_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb
index b6500e8560b..79de0d15642 100644
--- a/app/controllers/projects/branches_controller.rb
+++ b/app/controllers/projects/branches_controller.rb
@@ -82,7 +82,7 @@ class Projects::BranchesController < Projects::ApplicationController
format.js { render nothing: true, status: result[:return_code] }
format.json { render json: { message: result[:message] }, status: result[:return_code] }
- end
+ end
end
def destroy_all_merged