diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-01-30 10:35:50 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-01-30 10:35:50 +0000 |
| commit | 95e220de3ad1aff2a60a543c1842d838d9bfac26 (patch) | |
| tree | bb4625bdd4db687c18f2d83fcbac24d382f8f551 /app/helpers | |
| parent | 08c80098eeeee40b0487bc198d8bb08768da866a (diff) | |
| parent | eafccaad7346d6e1f8d13024bb5295bc683ab046 (diff) | |
| download | gitlab-ce-95e220de3ad1aff2a60a543c1842d838d9bfac26.tar.gz | |
Merge branch 'sh-issue-53419-fix' into 'master'
Fix Bitbucket Server import not allowing personal projects
Closes #53419
See merge request gitlab-org/gitlab-ce!23601
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/import_helper.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/helpers/import_helper.rb b/app/helpers/import_helper.rb index 49171df1433..d3befd87ccc 100644 --- a/app/helpers/import_helper.rb +++ b/app/helpers/import_helper.rb @@ -8,7 +8,9 @@ module ImportHelper end def sanitize_project_name(name) - name.gsub(/[^\w\-]/, '-') + # For personal projects in Bitbucket in the form ~username, we can + # just drop that leading tilde. + name.gsub(/\A~+/, '').gsub(/[^\w\-]/, '-') end def import_project_target(owner, name) |