summaryrefslogtreecommitdiff
path: root/app/models/discussion.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-07-25 22:49:21 -0600
committerDouwe Maan <douwe@selenight.nl>2016-07-25 22:49:21 -0600
commitb3180d34861085ce901730af62baa247f77ab5fa (patch)
treea1d517b0d3e6fc6125733b42733748f9f23066d1 /app/models/discussion.rb
parent3b06987c34e73ea044c09b7800170ac1dad93b3b (diff)
downloadgitlab-ce-b3180d34861085ce901730af62baa247f77ab5fa.tar.gz
Add resolved and last updated status to collapsed discussions
Diffstat (limited to 'app/models/discussion.rb')
-rw-r--r--app/models/discussion.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/app/models/discussion.rb b/app/models/discussion.rb
index 50fa814b311..9a13c1aad6c 100644
--- a/app/models/discussion.rb
+++ b/app/models/discussion.rb
@@ -39,6 +39,14 @@ class Discussion
@notes = notes
end
+ def last_updated_at
+ last_note.created_at
+ end
+
+ def last_updated_by
+ last_note.author
+ end
+
def id
first_note.discussion_id
end