summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Javier López <fjlopez@gitlab.com>2018-06-01 16:25:28 +0200
committerFrancisco Javier López <fjlopez@gitlab.com>2018-06-01 16:25:46 +0200
commit584dcfb2012abea899914d01943ce83da75daba5 (patch)
tree1e39c90942d00e2c79c19a5b4036d750f43e34cb
parent4bef03fd5412be9e7f0cf19ae65c5b4d775e4952 (diff)
downloadgitlab-ce-fj-40401-support-import-lfs-objects.tar.gz
-rw-r--r--app/services/projects/lfs_pointers/lfs_import_service.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/projects/lfs_pointers/lfs_import_service.rb b/app/services/projects/lfs_pointers/lfs_import_service.rb
index bfa9b61f3a3..b6b0dec142f 100644
--- a/app/services/projects/lfs_pointers/lfs_import_service.rb
+++ b/app/services/projects/lfs_pointers/lfs_import_service.rb
@@ -46,7 +46,7 @@ module Projects
# Retrieving those oids not linked and which we need to download
not_linked_lfs = existent_lfs.except(*linked_oids)
- LfsDownloadLinkListService.new(project, remote_uri: current_endpoint_url).execute(not_linked_lfs)
+ LfsDownloadLinkListService.new(project, remote_uri: current_endpoint_uri).execute(not_linked_lfs)
end
def lfsconfig_endpoint_uri
@@ -73,7 +73,7 @@ module Projects
raise LfsImportError, 'Invalid project import URL'
end
- def current_endpoint_url
+ def current_endpoint_uri
(lfsconfig_endpoint_uri || default_endpoint_uri)
end