summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_request.js
diff options
context:
space:
mode:
authorSimon Knox <simon@gitlab.com>2018-01-17 14:09:59 +0000
committerDouwe Maan <douwe@gitlab.com>2018-01-17 14:09:59 +0000
commitbfdde96f4870bf0e7f1e19541ffc884a97fd29f8 (patch)
tree8957d96322200f7092615509c229158719689d14 /app/assets/javascripts/merge_request.js
parentf2b7da8afb9f6309135738960ebf20d2afe4bec9 (diff)
downloadgitlab-ce-bfdde96f4870bf0e7f1e19541ffc884a97fd29f8.tar.gz
Resolve "Closed issue label in todo's styling is difficult to read"
Diffstat (limited to 'app/assets/javascripts/merge_request.js')
-rw-r--r--app/assets/javascripts/merge_request.js9
1 files changed, 5 insertions, 4 deletions
diff --git a/app/assets/javascripts/merge_request.js b/app/assets/javascripts/merge_request.js
index e26bf437efc..bedd50de1bb 100644
--- a/app/assets/javascripts/merge_request.js
+++ b/app/assets/javascripts/merge_request.js
@@ -1,6 +1,7 @@
/* eslint-disable func-names, space-before-function-paren, no-var, prefer-rest-params, wrap-iife, quotes, no-underscore-dangle, one-var, one-var-declaration-per-line, consistent-return, dot-notation, quote-props, comma-dangle, object-shorthand, max-len, prefer-arrow-callback */
import 'vendor/jquery.waitforimages';
+import { __ } from '~/locale';
import TaskList from './task_list';
import MergeRequestTabs from './merge_request_tabs';
import IssuablesHelper from './helpers/issuables_helper';
@@ -110,12 +111,12 @@ MergeRequest.prototype.initCommitMessageListeners = function() {
});
};
-MergeRequest.updateStatusText = function(classToRemove, classToAdd, newStatusText) {
+MergeRequest.setStatusBoxToMerged = function() {
$('.detail-page-header .status-box')
- .removeClass(classToRemove)
- .addClass(classToAdd)
+ .removeClass('status-box-open')
+ .addClass('status-box-mr-merged')
.find('span')
- .text(newStatusText);
+ .text(__('Merged'));
};
MergeRequest.decreaseCounter = function(by = 1) {