From dc68179b5918994c7bd09a2af240a4731bcf6980 Mon Sep 17 00:00:00 2001 From: Stefan Tatschner Date: Wed, 6 May 2015 11:10:48 +0200 Subject: [PATCH] Fix a trailing new line The "How to Merge" modal included a trailing new line in the code block. This commit removes that disfigurement. --- app/views/projects/merge_requests/show/_how_to_merge.html.haml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/views/projects/merge_requests/show/_how_to_merge.html.haml b/app/views/projects/merge_requests/show/_how_to_merge.html.haml index 63db4b30968..6474d32ac08 100644 --- a/app/views/projects/merge_requests/show/_how_to_merge.html.haml +++ b/app/views/projects/merge_requests/show/_how_to_merge.html.haml @@ -40,7 +40,6 @@ git merge --no-ff #{@merge_request.source_branch} git push origin #{@merge_request.target_branch} - :javascript $(function(){ var modal = $('#modal_merge_info').modal({modal: true, show:false});