summaryrefslogtreecommitdiff
path: root/lib/gitlab
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2019-04-08 16:20:23 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2019-04-08 16:20:23 +0000
commitf15caf0109998308e7f960baaa541d73be8bcacb (patch)
tree173b10d63a45c4a70417d49a07d78aaf483e90cd /lib/gitlab
parentedb7ca68651ecf5e342e57e280d603938a203121 (diff)
parentf3ad51f8a57df96bcc69b0821355ef29c3df2ac8 (diff)
downloadgitlab-ce-f15caf0109998308e7f960baaa541d73be8bcacb.tar.gz
Merge branch 'fix-pull-request-importer' into 'master'
Improve performance of PR import See merge request gitlab-org/gitlab-ce!27121
Diffstat (limited to 'lib/gitlab')
-rw-r--r--lib/gitlab/import/merge_request_helpers.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/import/merge_request_helpers.rb b/lib/gitlab/import/merge_request_helpers.rb
index b3fe1fc0685..4bc39868389 100644
--- a/lib/gitlab/import/merge_request_helpers.rb
+++ b/lib/gitlab/import/merge_request_helpers.rb
@@ -22,7 +22,7 @@ module Gitlab
# additional work that is strictly necessary.
merge_request_id = insert_and_return_id(attributes, project.merge_requests)
- merge_request = project.merge_requests.reload.find(merge_request_id)
+ merge_request = project.merge_requests.reset.find(merge_request_id)
[merge_request, false]
end