resolve conflicts for ce to ee merge

c9193e7e · Jarka Kadlecova · 8d60ebbb · c9193e7e
Commit c9193e7e authored Sep 05, 2017 by Jarka Kadlecova
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/serializers/issue_entity.rb app/serializers/issue_entity.rb +0 -3

No files found.
--- a/app/serializers/issue_entity.rb
+++ b/app/serializers/issue_entity.rb
@@ -7,12 +7,9 @@ class IssueEntity < IssuableEntity
  expose :due_date
  expose :moved_to_id
  expose :project_id
-<<<<<<< HEAD
  expose :weight, if: ->(issue, _) { issue.supports_weight? }
  expose :milestone, using: API::Entities::Milestone
  expose :labels, using: LabelEntity
-=======
->>>>>>> ce-com/master

  expose :web_url do |issue|
    project_issue_path(issue.project, issue)