diff options
| author | Robert Schilling <Razer6@users.noreply.github.com> | 2015-05-06 12:43:03 +0200 |
|---|---|---|
| committer | Robert Schilling <Razer6@users.noreply.github.com> | 2015-05-06 12:43:03 +0200 |
| commit | 7af59c54fc1fcf9d19927e76be49318689684f8b (patch) | |
| tree | ee9316e93f8a502cb1423b9f11f19b81998bc3c3 | |
| parent | 2856d5f9fcc0c3e7e8f9b22e722e50e88a04daee (diff) | |
| parent | dc68179b5918994c7bd09a2af240a4731bcf6980 (diff) | |
| download | gitlab-ce-7af59c54fc1fcf9d19927e76be49318689684f8b.tar.gz | |
Merge pull request #9248 from rumpelsepp/fix-modal
Fix a trailing new line
| -rw-r--r-- | app/views/projects/merge_requests/show/_how_to_merge.html.haml | 1 |
1 files changed, 0 insertions, 1 deletions
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}); |