Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-07-09 15:08:56 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-07-09 15:08:56 +0300
commitfcda041fc06e7bad3e4f5b5cff921f91c7eba717 (patch)
treea7e935192b9f846fa9257daf85a1642fbaa0f01a /app/helpers/import_helper.rb
parentc3b45354d720654215eb0e7b8e718ba6ea2d7a96 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/import_helper.rb')
-rw-r--r--app/helpers/import_helper.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/helpers/import_helper.rb b/app/helpers/import_helper.rb
index 9122ad5b35a..1ee67211ab0 100644
--- a/app/helpers/import_helper.rb
+++ b/app/helpers/import_helper.rb
@@ -19,7 +19,11 @@ module ImportHelper
end
def provider_project_link_url(provider_url, full_path)
- Gitlab::Utils.append_path(provider_url, full_path)
+ if Gitlab::Utils.parse_url(full_path)&.absolute?
+ full_path
+ else
+ Gitlab::Utils.append_path(provider_url, full_path)
+ end
end
def import_will_timeout_message(_ci_cd_only)