summaryrefslogtreecommitdiff
path: root/app/serializers
diff options
context:
space:
mode:
authorAndré Luís <me@andr3.net>2018-09-08 06:37:41 +0000
committerTim Zallmann <tzallmann@gitlab.com>2018-09-08 06:37:41 +0000
commit04c0d12d1a6cfaa54d2e5f510922b9d27c5c0a77 (patch)
treea633c79637f18b84b16f67dfca296ac0c1939185 /app/serializers
parent5949f55235da76eac6e204916502843a87a33d97 (diff)
downloadgitlab-ce-04c0d12d1a6cfaa54d2e5f510922b9d27c5c0a77.tar.gz
Resolve "Merge requests show outdated discussions on changes tab"
Diffstat (limited to 'app/serializers')
-rw-r--r--app/serializers/discussion_entity.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/serializers/discussion_entity.rb b/app/serializers/discussion_entity.rb
index ed09db0f3f4..ebe76c9fcda 100644
--- a/app/serializers/discussion_entity.rb
+++ b/app/serializers/discussion_entity.rb
@@ -6,6 +6,7 @@ class DiscussionEntity < Grape::Entity
expose :id, :reply_id
expose :position, if: -> (d, _) { d.diff_discussion? && !d.legacy_diff_discussion? }
+ expose :original_position, if: -> (d, _) { d.diff_discussion? && !d.legacy_diff_discussion? }
expose :line_code, if: -> (d, _) { d.diff_discussion? }
expose :expanded?, as: :expanded
expose :active?, as: :active, if: -> (d, _) { d.diff_discussion? }