diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-01-22 14:19:58 +0000 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2017-01-24 16:46:45 +0100 |
| commit | 94cc685f70dd7790a40d58fb654cb4a8c17f7eea (patch) | |
| tree | d76bedd8a11443cecbe29f973fb3015908fb3a1b /app | |
| parent | b697b78308923f9bef07af6cb4bba9a3709b750c (diff) | |
| download | gitlab-ce-94cc685f70dd7790a40d58fb654cb4a8c17f7eea.tar.gz | |
Merge branch 'merge-dropdown-this-context' into 'master'
Fixed bug with merge immediately button not working
See merge request !8696
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/merge_request_widget/ci_bundle.js.es6 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_request_widget/ci_bundle.js.es6 b/app/assets/javascripts/merge_request_widget/ci_bundle.js.es6 index 9c4a7eabcb6..5969d2ba56b 100644 --- a/app/assets/javascripts/merge_request_widget/ci_bundle.js.es6 +++ b/app/assets/javascripts/merge_request_widget/ci_bundle.js.es6 @@ -30,7 +30,7 @@ .off('click', '.js-merge-dropdown a') .on('click', '.js-merge-dropdown a', (e) => { e.preventDefault(); - $(this).closest('form').submit(); + $(e.target).closest('form').submit(); }); if ($('.rebase-in-progress').length) { merge_request_widget.rebaseInProgress(); |