diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-08-01 16:42:23 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-08-01 16:42:23 +0300 |
| commit | 47244ad5ea4e887ecb6dffa9f7b96846adbf4b6f (patch) | |
| tree | 823af4478325945020f36411fa315ae345918faf /app/serializers | |
| parent | 5f742eb95a0080343167469ccabfeccd3630007d (diff) | |
| parent | 09c1b008eb4b90c0a8becdf7ebb5723a8bd05468 (diff) | |
Merge branch 'andr3-remove-mr-regressions-fixes-from-master' into 'master'
Remove fixes for MR refactor regressions from master
See merge request gitlab-org/gitlab-ce!20920
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? } |