Automatic merge of gitlab-org/gitlab-ce master

app/models/project_services/jira_service.rb

@@ -265,6 +265,7 @@ class JiraService < IssueTrackerService
 
   def find_remote_link(issue, url)
     links = jira_request { issue.remotelink.all }
+    return unless links
 
     links.find { |link| link.object["url"] == url }
   end

app/services/projects/after_import_service.rb

@@ -9,7 +9,7 @@ module Projects
     end
 
     def execute
-      Projects::HousekeepingService.new(@project, :gc).execute do
+      Projects::HousekeepingService.new(@project).execute do
         repository.delete_all_refs_except(RESERVED_REF_PREFIXES)
       end
     rescue Projects::HousekeepingService::LeaseTaken => e

changelogs/unreleased/60180-jira-service-fix-nil-on-find-call.yml

+---
+title: 'Resolved JIRA service: NoMethodError: undefined method ''find'' for nil:NilClass'
+merge_request: 28206
+author:
+type: fixed

spec/models/project_services/jira_service_spec.rb

@@ -166,6 +166,13 @@ describe JiraService do
         ).once
       end
 
+      it 'does not fail if remote_link.all on issue returns nil' do
+        allow(JIRA::Resource::Remotelink).to receive(:all).and_return(nil)
+
+        expect { @jira_service.close_issue(resource, ExternalIssue.new('JIRA-123', project)) }
+            .not_to raise_error(NoMethodError)
+      end
+
       # Check https://developer.atlassian.com/jiradev/jira-platform/guides/other/guide-jira-remote-issue-links/fields-in-remote-issue-links
       # for more information
       it 'creates Remote Link reference in JIRA for comment' do

spec/services/projects/after_import_service_spec.rb

@@ -15,7 +15,7 @@ describe Projects::AfterImportService do
   describe '#execute' do
     before do
       allow(Projects::HousekeepingService)
-        .to receive(:new).with(project, :gc).and_return(housekeeping_service)
+        .to receive(:new).with(project).and_return(housekeeping_service)
 
       allow(housekeeping_service)
         .to receive(:execute).and_yield