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:
authorPhil Hughes <me@iamphill.com>2016-08-04 11:52:17 +0300
committerPhil Hughes <me@iamphill.com>2016-08-04 11:52:17 +0300
commit433f1c42c3958381a6af539e9a9ab206c749d9f4 (patch)
treed7cbefc34a9f7feed30786a068b4eb242104a70a /app/assets/javascripts/diff_notes/models/note.js.es6
parent538e66d71c0f7125cc62ea51480668ba8b342544 (diff)
Comment & resolve button no longer looks for can-resolve attribute
Fixed some bugs when removing notes
Diffstat (limited to 'app/assets/javascripts/diff_notes/models/note.js.es6')
-rw-r--r--app/assets/javascripts/diff_notes/models/note.js.es63
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/diff_notes/models/note.js.es6 b/app/assets/javascripts/diff_notes/models/note.js.es6
index 4cbd57e6ff4..f2d2d389c38 100644
--- a/app/assets/javascripts/diff_notes/models/note.js.es6
+++ b/app/assets/javascripts/diff_notes/models/note.js.es6
@@ -1,7 +1,8 @@
class NoteModel {
- constructor (discussionId, noteId, resolved, resolved_by) {
+ constructor (discussionId, noteId, canResolve, resolved, resolved_by) {
this.discussionId = discussionId;
this.id = noteId;
+ this.canResolve = canResolve;
this.resolved = resolved;
this.resolved_by = resolved_by;
}