diff options
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/base_discussion_entity.rb | 2 | ||||
| -rw-r--r-- | app/serializers/current_board_entity.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/serializers/base_discussion_entity.rb b/app/serializers/base_discussion_entity.rb index 8d4c3906847..7d3b9651b8b 100644 --- a/app/serializers/base_discussion_entity.rb +++ b/app/serializers/base_discussion_entity.rb @@ -40,7 +40,7 @@ class BaseDiscussionEntity < Grape::Entity end expose :resolve_with_issue_path do |discussion| - new_project_issue_path(discussion.project, merge_request_to_resolve_discussions_of: discussion.noteable.iid, discussion_to_resolve: discussion.id) + new_project_issue_path(discussion.project, merge_request_to_resolve_discussions_of: discussion.noteable.iid, discussion_to_resolve: discussion.id) if discussion&.project&.issues_enabled? end end diff --git a/app/serializers/current_board_entity.rb b/app/serializers/current_board_entity.rb index f9d6691dc84..08f31bc698f 100644 --- a/app/serializers/current_board_entity.rb +++ b/app/serializers/current_board_entity.rb @@ -3,6 +3,8 @@ class CurrentBoardEntity < Grape::Entity expose :id expose :name + expose :hide_backlog_list + expose :hide_closed_list end CurrentBoardEntity.prepend_if_ee('EE::CurrentBoardEntity') |