diff options
| author | David Planella <dplanella@gitlab.com> | 2019-05-28 22:33:07 +0200 |
|---|---|---|
| committer | David Planella <dplanella@gitlab.com> | 2019-05-28 22:33:07 +0200 |
| commit | bebc7b58b84b4061fec25c7bf1858c1abd274957 (patch) | |
| tree | 1b3372425af4451960d6bfba249bd1cc6eed15e5 /app/views/import/bitbucket_server/status.html.haml | |
| parent | 38e55d6b96e2bee43e7773182679fbcfe6f41ff3 (diff) | |
| parent | 8b200634c4909f12cd012c3197c4ffbaf50b99d5 (diff) | |
| download | gitlab-ce-bebc7b58b84b4061fec25c7bf1858c1abd274957.tar.gz | |
Merged changes from master
Diffstat (limited to 'app/views/import/bitbucket_server/status.html.haml')
| -rw-r--r-- | app/views/import/bitbucket_server/status.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/import/bitbucket_server/status.html.haml b/app/views/import/bitbucket_server/status.html.haml index c4e27efc76f..40609fddbde 100644 --- a/app/views/import/bitbucket_server/status.html.haml +++ b/app/views/import/bitbucket_server/status.html.haml @@ -56,7 +56,7 @@ .project-path.input-group-prepend - if current_user.can_select_namespace? - selected = params[:namespace_id] || :extra_group - - opts = current_user.can_create_group? ? { extra_group: Group.new(name: repo.project_key, path: repo.project_key) } : {} + - opts = current_user.can_create_group? ? { extra_group: Group.new(name: sanitize_project_name(repo.project_key), path: sanitize_project_name(repo.project_key)) } : {} = select_tag :namespace_id, namespaces_options(selected, opts.merge({ display_path: true })), { class: 'input-group-text select2 js-select-namespace', tabindex: 1 } - else = text_field_tag :path, current_user.namespace_path, class: "input-group-text input-large form-control", tabindex: 1, disabled: true |