Commit 5ed1847e authored by Ruben Davila's avatar Ruben Davila

Fix broken specs.

parent 80e314be
......@@ -148,8 +148,7 @@ class Projects::NotesController < Projects::ApplicationController
def note_json(note)
attrs = {
award: false,
id: note.id,
commands_changes: note.commands_changes
id: note.id
}
if note.is_a?(AwardEmoji)
......@@ -198,6 +197,7 @@ class Projects::NotesController < Projects::ApplicationController
)
end
attrs[:commands_changes] = note.commands_changes unless attrs[:award]
attrs
end
......
......@@ -18,4 +18,3 @@ class IssuableEntity < Grape::Entity
expose :human_time_estimate
expose :human_total_time_spent
end
class IssueSerializer < BaseSerializer
entity IssueEntity
end
class IssueSerializer < BaseSerializer
entity IssueEntity
end
class MergeRequestSerializer < BaseSerializer
entity MergeRequestEntity
end
class MergeRequestSerializer < BaseSerializer
entity MergeRequestEntity
end
......@@ -211,3 +211,4 @@ priorities:
- label
timelogs:
- trackable
- user
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment