summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2016-08-17 12:30:59 -0600
committerConnor Shea <connor.james.shea@gmail.com>2016-08-17 12:30:59 -0600
commit26c49cc156bde99842a49e3e4c29652643f296a0 (patch)
tree21ccff513641fc9d3435952750592d9fa8aa1908
parent2df34c20cb3d0346f5bb53b995d41a8c36ad71cb (diff)
downloadgitlab-ce-26c49cc156bde99842a49e3e4c29652643f296a0.tar.gz
Forgot another one.
-rw-r--r--app/assets/javascripts/diff_notes/components/comment_resolve_btn.js.es62
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/diff_notes/components/comment_resolve_btn.js.es6 b/app/assets/javascripts/diff_notes/components/comment_resolve_btn.js.es6
index 8dc9423c78f..67e9ed30c0d 100644
--- a/app/assets/javascripts/diff_notes/components/comment_resolve_btn.js.es6
+++ b/app/assets/javascripts/diff_notes/components/comment_resolve_btn.js.es6
@@ -11,6 +11,8 @@
showButton: function () {
if (this.discussion) {
return this.discussion.isResolvable();
+ } else {
+ return undefined;
}
},
isDiscussionResolved: function () {