summaryrefslogtreecommitdiff
path: root/app/views/projects
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2017-07-24 17:21:05 +0200
committerTim Zallmann <tzallmann@gitlab.com>2017-07-24 17:21:05 +0200
commitfef5a4fddd6ba0d152c553ab2b1667497400c062 (patch)
treede3c835fd6b1c518221326471762c020fb0c711b /app/views/projects
parentc2c8d7ffabaeb6514f7bf15fb5330c8402d80333 (diff)
downloadgitlab-ce-fef5a4fddd6ba0d152c553ab2b1667497400c062.tar.gz
How to Merge to external File
Diffstat (limited to 'app/views/projects')
-rw-r--r--app/views/projects/merge_requests/_how_to_merge.html.haml14
1 files changed, 3 insertions, 11 deletions
diff --git a/app/views/projects/merge_requests/_how_to_merge.html.haml b/app/views/projects/merge_requests/_how_to_merge.html.haml
index 766cb272bec..917ec7fdbda 100644
--- a/app/views/projects/merge_requests/_how_to_merge.html.haml
+++ b/app/views/projects/merge_requests/_how_to_merge.html.haml
@@ -1,3 +1,6 @@
+- content_for :page_specific_javascripts do
+ = webpack_bundle_tag('how_to_merge')
+
#modal_merge_info.modal
.modal-dialog
.modal-content
@@ -50,14 +53,3 @@
= succeed '.' do
You can also checkout merge requests locally by
= link_to 'following these guidelines', help_page_path('user/project/merge_requests/index.md', anchor: "checkout-merge-requests-locally"), target: '_blank', rel: 'noopener noreferrer'
-
-:javascript
- $(function(){
- var modal = $('#modal_merge_info').modal({modal: true, show:false});
- $('.how_to_merge_link').bind("click", function(){
- modal.show();
- });
- $('.modal-header .close').bind("click", function(){
- modal.hide();
- })
- })