Merge branch 'issue_48474' of gitlab.com:gitlab-org/gitlab-ce into issue_48474

590ffa95 · Felipe Artur · 6d41df50 · 416cdf6c · 590ffa95
Commit 590ffa95 authored Jul 04, 2018 by Felipe Artur
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/serializers/discussion_entity.rb app/serializers/discussion_entity.rb +1 -1

No files found.
--- a/app/serializers/discussion_entity.rb
+++ b/app/serializers/discussion_entity.rb
@@ -3,7 +3,7 @@ class DiscussionEntity < Grape::Entity
  include NotesHelper

  expose :id, :reply_id
-  expose :position, if: -> (d, _) { d.diff_discussion? && !d.legacy_diff_discussion?}
+  expose :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? }