summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_requests.js.coffee
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-08-01 15:59:57 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-08-01 15:59:57 +0300
commitce5fca48288043bf1e7077826a9b36a16b3eb5c7 (patch)
treefe5d55ca21e68f14014f22ffacaf7f62f4d874af /app/assets/javascripts/merge_requests.js.coffee
parent08bcf639a015628f5ddfc34236bc6b84a977957f (diff)
downloadgitlab-ce-ce5fca48288043bf1e7077826a9b36a16b3eb5c7.tar.gz
Fix MR modal
Diffstat (limited to 'app/assets/javascripts/merge_requests.js.coffee')
-rw-r--r--app/assets/javascripts/merge_requests.js.coffee7
1 files changed, 1 insertions, 6 deletions
diff --git a/app/assets/javascripts/merge_requests.js.coffee b/app/assets/javascripts/merge_requests.js.coffee
index 769a940959b..153198ca5c5 100644
--- a/app/assets/javascripts/merge_requests.js.coffee
+++ b/app/assets/javascripts/merge_requests.js.coffee
@@ -22,12 +22,7 @@ class MergeRequest
this.$('.show-all-commits').on 'click', =>
this.showAllCommits()
- modal = $('#modal_merge_info').modal modal: true, show:false
-
- $('.how_to_merge_link').bind "click", ->
- modal.show()
- $('.modal-header .close').bind "click", ->
- modal.hide()
+ modal = $('#modal_merge_info').modal(show: false)
# Local jQuery finder
$: (selector) ->