1 files changed, 37 insertions, 17 deletions
diff --git a/lib/gitlab/github_import/importer/pull_request_merged_by_importer.rb b/lib/gitlab/github_import/importer/pull_request_merged_by_importer.rb
index 640914acf4d..f05aa26a449 100644
--- a/lib/gitlab/github_import/importer/pull_request_merged_by_importer.rb
+++ b/lib/gitlab/github_import/importer/pull_request_merged_by_importer.rb
@@ -4,42 +4,62 @@ module Gitlab
   module GithubImport
     module Importer
       class PullRequestMergedByImporter
+        # pull_request - An instance of
+        #                `Gitlab::GithubImport::Representation::PullRequest`
+        # project - An instance of `Project`
+        # client - An instance of `Gitlab::GithubImport::Client`
         def initialize(pull_request, project, client)
-          @project = project
           @pull_request = pull_request
+          @project = project
           @client = client
         end
 
         def execute
-          merge_request = project.merge_requests.find_by_iid(pull_request.iid)
-          timestamp = Time.new.utc
-          merged_at = pull_request.merged_at
           user_finder = GithubImport::UserFinder.new(project, client)
-          gitlab_user_id = user_finder.user_id_for(pull_request.merged_by)
 
+          gitlab_user_id = begin
+            user_finder.user_id_for(pull_request.merged_by)
+          rescue ::Octokit::NotFound
+            nil
+          end
+
+          metrics_upsert(gitlab_user_id)
+
+          add_note!
+        end
+
+        private
+
+        attr_reader :project, :pull_request, :client
+
+        def metrics_upsert(gitlab_user_id)
           MergeRequest::Metrics.upsert({
             target_project_id: project.id,
             merge_request_id: merge_request.id,
             merged_by_id: gitlab_user_id,
-            merged_at: merged_at,
+            merged_at: pull_request.merged_at,
             created_at: timestamp,
             updated_at: timestamp
           }, unique_by: :merge_request_id)
+        end
 
-          unless gitlab_user_id
-            merge_request.notes.create!(
-              importing: true,
-              note: missing_author_note,
-              author_id: project.creator_id,
-              project: project,
-              created_at: merged_at
-            )
-          end
+        def add_note!
+          merge_request.notes.create!(
+            importing: true,
+            note: missing_author_note,
+            author_id: project.creator_id,
+            project: project,
+            created_at: pull_request.merged_at
+          )
         end
 
-        private
+        def merge_request
+          @merge_request ||= project.merge_requests.find_by_iid(pull_request.iid)
+        end
 
-        attr_reader :project, :pull_request, :client
+        def timestamp
+          @timestamp ||= Time.new.utc
+        end
 
         def missing_author_note
           s_("GitHubImporter|*Merged by: %{author} at %{timestamp}*") % {