diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-10-20 18:00:19 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-10-20 18:00:19 +0000 |
| commit | 672ab77bf42383a3fa90905d05b303fbe34263e8 (patch) | |
| tree | 3c1a358bd7e8bc69b33e64d8d108c60866de7eed /app | |
| parent | 5af17a752dc2860799d65fecf4875764b99790b1 (diff) | |
| parent | 474313e44034882122c60329b7c72b0f31cac45b (diff) | |
| download | gitlab-ce-672ab77bf42383a3fa90905d05b303fbe34263e8.tar.gz | |
Merge branch 'pass-namespace-gitlab-project-import' into 'master'
Fix GitLab project import when a user has access only to their default namespace
## What does this MR do?
It fixes a bug when a namespace ID was not passed to `/import/gitlab_project/new` page. It occurred when a user have no choice of the namespace, so we did not render the input for namespace ID. This MR introduces a hidden input for the described case.
## Does this MR meet the acceptance criteria?
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Fixes #23507
See merge request !6995
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/new.html.haml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index cc8cb134fb8..399ccf15b7f 100644 --- a/app/views/projects/new.html.haml +++ b/app/views/projects/new.html.haml @@ -27,6 +27,7 @@ - else .input-group-addon.static-namespace #{root_url}#{current_user.username}/ + = f.hidden_field :namespace_id, value: current_user.namespace_id .form-group.col-xs-12.col-sm-6.project-path = f.label :namespace_id, class: 'label-light' do %span |