diff options
author | Stan Hu <stanhu@gmail.com> | 2018-07-07 14:53:35 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2018-07-07 14:53:35 -0700 |
commit | b3deab852bcbfe1fd86475d2881cd328c5374b05 (patch) | |
tree | d5d0a16918d6b270ddb2b42758dfca71949a808f /app/views/import | |
parent | 7967793c5516d1966ed9e3468211529a48b18d9e (diff) | |
parent | e0c0ce28ea786a23d15eee95d56560079b0c6dfe (diff) | |
download | gitlab-ce-b3deab852bcbfe1fd86475d2881cd328c5374b05.tar.gz |
Merge branch 'master' into sh-support-bitbucket-server-import
Diffstat (limited to 'app/views/import')
-rw-r--r-- | app/views/import/_githubish_status.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/import/_githubish_status.html.haml b/app/views/import/_githubish_status.html.haml index f7094375023..5e7be5cd37b 100644 --- a/app/views/import/_githubish_status.html.haml +++ b/app/views/import/_githubish_status.html.haml @@ -40,7 +40,7 @@ = project.human_import_status_name - @repos.each do |repo| - %tr{ id: "repo_#{repo.id}" } + %tr{ id: "repo_#{repo.id}", data: { qa: { repo_path: repo.full_name } } } %td = provider_project_link(provider, repo.full_name) %td.import-target @@ -50,7 +50,7 @@ - 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, path: repo.owner.login) } : {} - = select_tag :namespace_id, namespaces_options(selected, opts.merge({ display_path: true })), { class: 'input-group-text select2 js-select-namespace', tabindex: 1 } + = select_tag :namespace_id, namespaces_options(selected, opts.merge({ display_path: true })), { class: 'input-group-text select2 js-select-namespace qa-project-namespace-select', tabindex: 1 } - else = text_field_tag :path, current_user.namespace_path, class: "input-group-text input-large form-control", tabindex: 1, disabled: true %span.input-group-prepend |