Resolve conflict in issue_sidebar_extras_entity.rb

51e35966 · Marin Jankovski · 02a0b988 · 51e35966
Commit 51e35966 authored Dec 25, 2018 by Marin Jankovski
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

app/serializers/issue_sidebar_extras_entity.rb app/serializers/issue_sidebar_extras_entity.rb +7 -0

No files found.
--- a/app/serializers/issue_sidebar_extras_entity.rb
+++ b/app/serializers/issue_sidebar_extras_entity.rb
+# frozen_string_literal: true
+
+class IssueSidebarExtrasEntity < IssuableSidebarExtrasEntity
+  expose :assignees, using: API::Entities::UserBasic
+end
+
+IssueSidebarExtrasEntity.prepend(EE::IssueSidebarExtrasEntity)