Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2016-08-17 19:01:26 +0300
committerConnor Shea <connor.james.shea@gmail.com>2016-08-17 19:01:26 +0300
commitf3acf9fd248a16665a114bf6cce761e9277c2d5b (patch)
tree0b08adb36772eacb88f084cdbc3736a7c437718a /app/assets/javascripts/diff_notes
parenta77629b1cbc94416b2e2d229be5c1afe937f408a (diff)
Remove non-standard VueJS files from vendor.
Diffstat (limited to 'app/assets/javascripts/diff_notes')
-rw-r--r--app/assets/javascripts/diff_notes/components/resolve_btn.js.es62
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/diff_notes/components/resolve_btn.js.es6 b/app/assets/javascripts/diff_notes/components/resolve_btn.js.es6
index b465cd019dd..be6ebc77947 100644
--- a/app/assets/javascripts/diff_notes/components/resolve_btn.js.es6
+++ b/app/assets/javascripts/diff_notes/components/resolve_btn.js.es6
@@ -40,6 +40,8 @@
return `Resolved by ${this.resolvedByName}`;
} else if (this.canResolve) {
return 'Mark as resolved';
+ } else {
+ return 'Unable to resolve';
}
},
isResolved: function () {