Merge branch...

Merge branch '20917-do-not-show-button-to-resolve-discussion-opening-an-issue-when-issues-are-disabled-or-not' into 'master'

Do not show button to resolve discussion opening an issue when issues are disabled or not visible to user

See merge request gitlab-org/gitlab!54263

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
 

changelogs/unreleased/20917-do-not-show-button-to-resolve-discussion-opening-an-issue-when-issu.yml

+---
+title: Do not show button to resolve discussion opening an issue when issues are disabled
+merge_request: 54263
+author:
+type: fixed

spec/serializers/base_discussion_entity_spec.rb

@@ -66,4 +66,13 @@ RSpec.describe BaseDiscussionEntity do
       )
     end
   end
+
+  context 'when issues are disabled in a project' do
+    let(:project) { create(:project, :issues_disabled) }
+    let(:note) { create(:discussion_note_on_merge_request, project: project) }
+
+    it 'does not show a new issues path' do
+      expect(entity.as_json[:resolve_with_issue_path]).to be_nil
+    end
+  end
 end