diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-07-06 15:31:53 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-07-06 15:31:53 +0000 |
| commit | a291bcdf0d3ed892dcb805e11a43afcadbc20e8b (patch) | |
| tree | 392874244367bd49bbc2b2c14eff5e30ec9b7585 /app | |
| parent | 06b9d4b42b3277e1a092169b93c2af17aa3b11a1 (diff) | |
| parent | 2ad990bba0cce86bd2e44d2e91e73f874f0f0896 (diff) | |
| download | gitlab-ce-a291bcdf0d3ed892dcb805e11a43afcadbc20e8b.tar.gz | |
Merge branch 'rc-qa-146' into 'master'
Add a new scenario to test GitHub import
Closes gitlab-qa#146
See merge request gitlab-org/gitlab-ce!19555
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/import/_githubish_status.html.haml | 4 | ||||
| -rw-r--r-- | app/views/layouts/header/_new_dropdown.haml | 2 |
2 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 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 diff --git a/app/views/layouts/header/_new_dropdown.haml b/app/views/layouts/header/_new_dropdown.haml index d35df706036..792291bde75 100644 --- a/app/views/layouts/header/_new_dropdown.haml +++ b/app/views/layouts/header/_new_dropdown.haml @@ -37,7 +37,7 @@ %li.dropdown-bold-header GitLab - if current_user.can_create_project? %li - = link_to 'New project', new_project_path + = link_to 'New project', new_project_path, class: 'qa-global-new-project-link' - if current_user.can_create_group? %li = link_to 'New group', new_group_path |