diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-08-26 18:00:10 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-08-26 18:00:10 +0300 |
| commit | ec54fd36e991b2c19b4e4d07342a6f3a1de2d8b1 (patch) | |
| tree | 97c2d31af593fd45f20e250e602bd33302d57a9c /app/views | |
| parent | 5566588f1f0d85044527ffea292044a3bccc69c2 (diff) | |
| parent | f2005125dfe7810de910b61dee8d7a9203a6ca6e (diff) | |
Merge branch 'sh-sanitize-project-import-names' into 'master'
Use slugs for default project path and sanitize names before import
See merge request gitlab-org/gitlab-ce!21367
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/import/_githubish_status.html.haml | 2 | ||||
| -rw-r--r-- | app/views/import/bitbucket/status.html.haml | 2 | ||||
| -rw-r--r-- | app/views/import/bitbucket_server/status.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/import/_githubish_status.html.haml b/app/views/import/_githubish_status.html.haml index f0d1e837317..f4a29ed18dc 100644 --- a/app/views/import/_githubish_status.html.haml +++ b/app/views/import/_githubish_status.html.haml @@ -45,7 +45,7 @@ = text_field_tag :path, current_user.namespace_path, class: "input-group-text input-large form-control", tabindex: 1, disabled: true %span.input-group-prepend .input-group-text / - = text_field_tag :path, repo.name, class: "input-mini form-control", tabindex: 2, autofocus: true, required: true + = text_field_tag :path, sanitize_project_name(repo.name), class: "input-mini form-control", tabindex: 2, autofocus: true, required: true %td.import-actions.job-status = button_tag class: "btn btn-import js-add-to-import" do = has_ci_cd_only_params? ? _('Connect') : _('Import') diff --git a/app/views/import/bitbucket/status.html.haml b/app/views/import/bitbucket/status.html.haml index a75b7aa9dd2..3b1b5e55302 100644 --- a/app/views/import/bitbucket/status.html.haml +++ b/app/views/import/bitbucket/status.html.haml @@ -63,7 +63,7 @@ = text_field_tag :path, current_user.namespace_path, class: "input-group-text input-large form-control", tabindex: 1, disabled: true %span.input-group-prepend .input-group-text / - = text_field_tag :path, repo.name, class: "input-mini form-control", tabindex: 2, autofocus: true, required: true + = text_field_tag :path, sanitize_project_name(repo.slug), class: "input-mini form-control", tabindex: 2, autofocus: true, required: true %td.import-actions.job-status = button_tag class: 'btn btn-import js-add-to-import' do = _('Import') diff --git a/app/views/import/bitbucket_server/status.html.haml b/app/views/import/bitbucket_server/status.html.haml index 3d05a5e696f..ae09e0dfa18 100644 --- a/app/views/import/bitbucket_server/status.html.haml +++ b/app/views/import/bitbucket_server/status.html.haml @@ -61,7 +61,7 @@ = text_field_tag :path, current_user.namespace_path, class: "input-group-text input-large form-control", tabindex: 1, disabled: true %span.input-group-prepend .input-group-text / - = text_field_tag :path, repo.name, class: "input-mini form-control", tabindex: 2, autofocus: true, required: true + = text_field_tag :path, sanitize_project_name(repo.slug), class: "input-mini form-control", tabindex: 2, autofocus: true, required: true %td.import-actions.job-status = button_tag class: 'btn btn-import js-add-to-import' do Import |