diff options
author | André Luís <aluis@gitlab.com> | 2018-07-31 01:51:23 +0100 |
---|---|---|
committer | André Luís <aluis@gitlab.com> | 2018-08-01 13:45:16 +0100 |
commit | 09c1b008eb4b90c0a8becdf7ebb5723a8bd05468 (patch) | |
tree | 136f242cc97e9c696b0f514f28cc5607619a45a8 /app/serializers | |
parent | e3eab3661997a3a698d0763f0625add6413b4732 (diff) | |
download | gitlab-ce-09c1b008eb4b90c0a8becdf7ebb5723a8bd05468.tar.gz |
Revert "Merge branch '_acet-fix-outdated-discussions' into 'master'"
This reverts commit 740ae2d194f3833e224c326cc909d833c5807484, reversing
changes made to 1ba47de5fef7a86a453e97a574741d3dba85c521.
Diffstat (limited to 'app/serializers')
-rw-r--r-- | app/serializers/discussion_entity.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/serializers/discussion_entity.rb b/app/serializers/discussion_entity.rb index 6f95e6f9ca1..b8321037fa5 100644 --- a/app/serializers/discussion_entity.rb +++ b/app/serializers/discussion_entity.rb @@ -6,7 +6,6 @@ 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? } |