summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-01-14 19:56:52 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-01-14 19:56:52 +0200
commit99a2b31e98f3934407b782ee4a2d2a26c8ec4e2a (patch)
treeaf14996da714227948312f213c39b81972db069a
parent9247490109b9d4e4691d304e7bfb4bca6d54e209 (diff)
downloadgitlab-ce-99a2b31e98f3934407b782ee4a2d2a26c8ec4e2a.tar.gz
Dont allow merge without commit message
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/assets/javascripts/merge_requests.js.coffee2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/merge_requests.js.coffee b/app/assets/javascripts/merge_requests.js.coffee
index 047683f00b2..ff843c68d68 100644
--- a/app/assets/javascripts/merge_requests.js.coffee
+++ b/app/assets/javascripts/merge_requests.js.coffee
@@ -24,6 +24,8 @@ class MergeRequest
modal = $('#modal_merge_info').modal(show: false)
+ disableButtonIfEmptyField '#merge_commit_message', '.accept_merge_request'
+
# Local jQuery finder
$: (selector) ->
this.$el.find(selector)