Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 7 deletions

diff --git a/app/workers/error_tracking_issue_link_worker.rb b/app/workers/error_tracking_issue_link_worker.rb
index 5048f361c31..b306ecc154b 100644
--- a/app/workers/error_tracking_issue_link_worker.rb
+++ b/app/workers/error_tracking_issue_link_worker.rb
@@ -20,17 +20,11 @@ class ErrorTrackingIssueLinkWorker
   def perform(issue_id)
     @issue = Issue.find_by_id(issue_id)
 
-    return unless issue && error_tracking && sentry_issue_id
+    return unless valid?
 
     try_obtain_lease do
       logger.info("Linking Sentry issue #{sentry_issue_id} to GitLab issue #{issue.id}")
 
-      if integration_id.nil?
-        logger.info("Sentry integration unavailable for #{error_tracking.api_url}")
-
-        break
-      end
-
       sentry_client.create_issue_link(integration_id, sentry_issue_id, issue)
     rescue Sentry::Client::Error
       logger.info("Failed to link Sentry issue #{sentry_issue_id} to GitLab issue #{issue.id}")
@@ -39,6 +33,10 @@ class ErrorTrackingIssueLinkWorker
 
   private
 
+  def valid?
+    issue && error_tracking && sentry_issue_id
+  end
+
   def error_tracking
     strong_memoize(:error_tracking) do
       issue.project.error_tracking_setting