Merge branch 'jprovazn-fix-link-type-flag-check' into 'master'

Fix feature flag check for issue link types

See merge request gitlab-org/gitlab!23264

ee/app/serializers/linked_project_issue_entity.rb

@@ -11,7 +11,7 @@ class LinkedProjectIssueEntity < LinkedIssueEntity
     end
   end
 
-  expose :link_type, if: -> (issue, _) { Feature.enabled?(:issue_link_types, issue.project) } do |issue|
+  expose :link_type, if: -> (*) { Feature.enabled?(:issue_link_types, issuable.project) } do |issue|
     issue.issue_link_type
   end
 

ee/spec/serializers/linked_project_issue_entity_spec.rb

@@ -33,5 +33,21 @@ describe LinkedProjectIssueEntity do
 
       it { expect(entity.as_json).not_to include(:link_type) }
     end
+
+    context 'when issue_link_types is not enabled for target issue project' do
+      before do
+        stub_feature_flags(issue_link_types: { thing: issue_link.target.project, enabled: false })
+      end
+
+      it { expect(entity.as_json).to include(link_type: 'relates_to') }
+    end
+
+    context 'when issue_link_types is not enabled for source issue project' do
+      before do
+        stub_feature_flags(issue_link_types: { thing: issue_link.source.project, enabled: false })
+      end
+
+      it { expect(entity.as_json).not_to include(:link_type) }
+    end
   end
 end