diff options
| author | Samantha Ming <sming@gitlab.com> | 2019-07-26 05:30:50 +0300 |
|---|---|---|
| committer | Paul Slaughter <pslaughter@gitlab.com> | 2019-08-20 23:15:18 +0300 |
| commit | f1f34baf6f4e0866feb3f4c7523e3dccf5784b0b (patch) | |
| tree | 0922f96df924d9e9bf99ccc3a047683b7586b9c7 /app/serializers/merge_request_serializer.rb | |
| parent | fd589be32f02c160812bbce0f5fb2178fb7142d3 (diff) | |
Improve UX multi assigness in MR
Add merge warning on avatar in:
- open view assigness
- collapsed view assigness
- dropdown (search) view assigness
Add can_merge option to MR sidebar entity
Diffstat (limited to 'app/serializers/merge_request_serializer.rb')
| -rw-r--r-- | app/serializers/merge_request_serializer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/merge_request_serializer.rb b/app/serializers/merge_request_serializer.rb index 8ad1df5dfe0..bd2e682a122 100644 --- a/app/serializers/merge_request_serializer.rb +++ b/app/serializers/merge_request_serializer.rb @@ -8,7 +8,7 @@ class MergeRequestSerializer < BaseSerializer entity ||= case opts[:serializer] when 'sidebar' - IssuableSidebarBasicEntity + MergeRequestSidebarBasicEntity when 'sidebar_extras' MergeRequestSidebarExtrasEntity when 'basic' |