Fix broken specs.

app/controllers/projects/notes_controller.rb

@@ -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
 

app/serializers/issuable_entity.rb

@@ -18,4 +18,3 @@ class IssuableEntity < Grape::Entity
   expose :human_time_estimate
   expose :human_total_time_spent
 end
-

app/serializers/issue_serializer.rb

- class IssueSerializer < BaseSerializer
-   entity IssueEntity
- end
+class IssueSerializer < BaseSerializer
+  entity IssueEntity
+end

app/serializers/merge_request_serializer.rb

- class MergeRequestSerializer < BaseSerializer
-   entity MergeRequestEntity
- end
+class MergeRequestSerializer < BaseSerializer
+  entity MergeRequestEntity
+end

spec/lib/gitlab/import_export/all_models.yml

@@ -211,3 +211,4 @@ priorities:
 - label
 timelogs:
 - trackable
+- user