diff options
author | Tim Zallmann <tzallmann@gitlab.com> | 2018-01-05 13:42:46 +0000 |
---|---|---|
committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-01-05 13:42:46 +0000 |
commit | 6c2a35fe4865a50338b38f89279813130c0a6cba (patch) | |
tree | 5bc5502eed507a8116c209099bd9cca2e7210499 /app | |
parent | 47e5a7f8e3c3a16bb8803f5156a65febf614f467 (diff) | |
parent | 0d6b9e30cb5c3b76ee97cd14dea1dae12a74e8d6 (diff) | |
download | gitlab-ce-6c2a35fe4865a50338b38f89279813130c0a6cba.tar.gz |
Merge branch 'jivl-fix-import-project-url-bug' into 'master'
Fix import project url not updating project name
Closes #40607
See merge request gitlab-org/gitlab-ce!16120
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/projects/project_new.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js index 3ecc0c2a6e5..4710e70d619 100644 --- a/app/assets/javascripts/projects/project_new.js +++ b/app/assets/javascripts/projects/project_new.js @@ -1,6 +1,7 @@ let hasUserDefinedProjectPath = false; -const deriveProjectPathFromUrl = ($projectImportUrl, $projectPath) => { +const deriveProjectPathFromUrl = ($projectImportUrl) => { + const $currentProjectPath = $projectImportUrl.parents('.toggle-import-form').find('#project_path'); if (hasUserDefinedProjectPath) { return; } @@ -21,7 +22,7 @@ const deriveProjectPathFromUrl = ($projectImportUrl, $projectPath) => { // extract everything after the last slash const pathMatch = /\/([^/]+)$/.exec(importUrl); if (pathMatch) { - $projectPath.val(pathMatch[1]); + $currentProjectPath.val(pathMatch[1]); } }; @@ -96,7 +97,7 @@ const bindEvents = () => { hasUserDefinedProjectPath = $projectPath.val().trim().length > 0; }); - $projectImportUrl.keyup(() => deriveProjectPathFromUrl($projectImportUrl, $projectPath)); + $projectImportUrl.keyup(() => deriveProjectPathFromUrl($projectImportUrl)); }; document.addEventListener('DOMContentLoaded', bindEvents); |