summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_request.js
diff options
context:
space:
mode:
authorSimon Knox <psimyn@gmail.com>2018-01-16 23:29:13 +1100
committerSimon Knox <psimyn@gmail.com>2018-01-16 23:29:13 +1100
commit5816a42ed20829968cf64b08fc2bd9c2c4768079 (patch)
tree825fd95ad2dad2ea304ab7154564cd0b919f85be /app/assets/javascripts/merge_request.js
parent81660bc35010307d472ea4283d6046661e22a1ca (diff)
parentbe353219d1eec05a7b04e9c2e94f61573889549d (diff)
downloadgitlab-ce-41874-closed-todo.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 41874-closed-todo41874-closed-todo
Diffstat (limited to 'app/assets/javascripts/merge_request.js')
-rw-r--r--app/assets/javascripts/merge_request.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/merge_request.js b/app/assets/javascripts/merge_request.js
index e0360b104ca..bedd50de1bb 100644
--- a/app/assets/javascripts/merge_request.js
+++ b/app/assets/javascripts/merge_request.js
@@ -111,7 +111,7 @@ MergeRequest.prototype.initCommitMessageListeners = function() {
});
};
-MergeRequest.prototype.setStatusBoxToMerged = function() {
+MergeRequest.setStatusBoxToMerged = function() {
$('.detail-page-header .status-box')
.removeClass('status-box-open')
.addClass('status-box-mr-merged')
@@ -119,14 +119,14 @@ MergeRequest.prototype.setStatusBoxToMerged = function() {
.text(__('Merged'));
};
-MergeRequest.prototype.decreaseCounter = function(by = 1) {
- const $el = $('.nav-links .js-merge-counter');
+MergeRequest.decreaseCounter = function(by = 1) {
+ const $el = $('.js-merge-counter');
const count = Math.max((parseInt($el.text().replace(/[^\d]/, ''), 10) - by), 0);
$el.text(addDelimiter(count));
};
-MergeRequest.prototype.hideCloseButton = function() {
+MergeRequest.hideCloseButton = function() {
const el = document.querySelector('.merge-request .js-issuable-actions');
const closeDropdownItem = el.querySelector('li.close-item');
if (closeDropdownItem) {