summaryrefslogtreecommitdiff
path: root/app/views/import
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-09-20 09:58:44 +0200
committerJames Lopez <james@jameslopez.es>2016-09-20 10:15:20 +0200
commit62cd17bba57374c06652a479a2b8240b7da7588a (patch)
tree3224cd68e51e8e34a4f7db45be278b143455bbf7 /app/views/import
parent13e818981506f90b8a4686558d1b40d82dd2b7f9 (diff)
downloadgitlab-ce-62cd17bba57374c06652a479a2b8240b7da7588a.tar.gz
fixes CSS issues and namespace path issue. Also tested in different browsers.
Diffstat (limited to 'app/views/import')
-rw-r--r--app/views/import/github/status.html.haml12
1 files changed, 6 insertions, 6 deletions
diff --git a/app/views/import/github/status.html.haml b/app/views/import/github/status.html.haml
index 4aaf0db6a1b..dd572453b91 100644
--- a/app/views/import/github/status.html.haml
+++ b/app/views/import/github/status.html.haml
@@ -46,16 +46,16 @@
= github_project_link(repo.full_name)
%td.import-target
%fieldset.row
- .input-group.col-sm-8
+ .input-group
.project-path.input-group-btn
- - if false
+ - if current_user.can_select_namespace?
- selected = params[:namespace_id] || :current_user
- - opts = current_user.can_create_group? ? { extra_group: Group.new(name: repo.owner.login) } : { display_path: true }
- = select_tag :namespace_id, namespaces_options(selected, opts), { class: 'select2 js-select-namespace', tabindex: 1 }
+ - opts = current_user.can_create_group? ? { extra_group: Group.new(name: repo.owner.login, path: repo.owner.login) }: {}
+ = select_tag :namespace_id, namespaces_options(selected, opts.merge({ display_path: true })), { class: 'select2 js-select-namespace', tabindex: 1 }
- else
- = text_field_tag :path, current_user.namespace_path, class: "form-control", tabindex: 1, autofocus: true, disabled: true
+ = text_field_tag :path, current_user.namespace_path, class: "input-large form-control", tabindex: 1, disabled: true
%span.input-group-addon /
- = text_field_tag :path, repo.name, class: "form-control", tabindex: 2, autofocus: true, required: true
+ = text_field_tag :path, 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
Import