summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-08-15 18:45:23 -0500
committerDouwe Maan <douwe@selenight.nl>2016-08-16 11:04:26 -0500
commit41007f6d3c30a294bbf361ff900b3b19bb463291 (patch)
tree5a5bfd55bcac4587b737bd4bc877250469ff375c /app/models
parent32e31d626f743c22b5ed21c50555f4670d5290f9 (diff)
downloadgitlab-ce-41007f6d3c30a294bbf361ff900b3b19bb463291.tar.gz
Address review feedback
Diffstat (limited to 'app/models')
-rw-r--r--app/models/diff_note.rb2
-rw-r--r--app/models/discussion.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/app/models/diff_note.rb b/app/models/diff_note.rb
index 64c347a3e92..cfcdce790e5 100644
--- a/app/models/diff_note.rb
+++ b/app/models/diff_note.rb
@@ -113,7 +113,7 @@ class DiffNote < Note
Discussion.new(discussion_notes)
end
- def as_discussion
+ def to_discussion
Discussion.new([self])
end
diff --git a/app/models/discussion.rb b/app/models/discussion.rb
index 09d4596094e..b26d2282b00 100644
--- a/app/models/discussion.rb
+++ b/app/models/discussion.rb
@@ -57,6 +57,8 @@ class Discussion
def id
first_note.discussion_id
end
+
+ alias_method :to_param, :id
def diff_discussion?
first_note.diff_note?