diff options
author | Stan Hu <stanhu@gmail.com> | 2019-09-06 15:49:14 +0000 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-09-06 15:49:14 +0000 |
commit | 6dd99d8224f05a9ec3dd35b4f48e842f172ec604 (patch) | |
tree | 085822a3fb825c9fc3bd6634e14182c24c2554b7 /app | |
parent | 05fca5ff1558433029eb9771e582b99399a3eaaa (diff) | |
parent | e8a4ee8ad3987d5c08a07b76a83f3ccef4c546a9 (diff) | |
download | gitlab-ce-6dd99d8224f05a9ec3dd35b4f48e842f172ec604.tar.gz |
Merge branch 'id-autosave-for-new-mr' into 'master'
Fix sharing notes data in localStorage with all MRs
See merge request gitlab-org/gitlab-ce!32699
Diffstat (limited to 'app')
-rw-r--r-- | app/serializers/merge_request_noteable_entity.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/merge_request_noteable_entity.rb b/app/serializers/merge_request_noteable_entity.rb index e22be6880bb..9504fdd8eac 100644 --- a/app/serializers/merge_request_noteable_entity.rb +++ b/app/serializers/merge_request_noteable_entity.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class MergeRequestNoteableEntity < Grape::Entity +class MergeRequestNoteableEntity < IssuableEntity include RequestAwareEntity # Currently this attr is exposed to be used in app/assets/javascripts/notes/stores/getters.js |