diff options
| author | Sean McGivern <sean@gitlab.com> | 2018-11-21 14:09:02 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2018-11-21 14:09:02 +0300 |
| commit | eb3683fa65a6c943ae79352c90bd1ad3e810ef01 (patch) | |
| tree | c04091cc5071fdaf4d5433639f95b49a862758b9 /app/views | |
| parent | e0826959ead862de5ce761b4109b84e92a6d2f53 (diff) | |
| parent | c216b25dfeccfd20de56ea2f0eb467a00f5e4933 (diff) | |
Merge branch '52453-show-subgroups-in-group-create-issue' into 'master'
Resolve "Access project from descendent groups when selecting project to create new issue"
Closes #47096 and #52453
See merge request gitlab-org/gitlab-ce!22612
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/groups/issues.html.haml | 2 | ||||
| -rw-r--r-- | app/views/groups/merge_requests.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/_new_project_item_select.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/groups/issues.html.haml b/app/views/groups/issues.html.haml index 5e1ae1dbe38..91d17cfd745 100644 --- a/app/views/groups/issues.html.haml +++ b/app/views/groups/issues.html.haml @@ -9,7 +9,7 @@ = render 'shared/issuable/nav', type: :issues .nav-controls = render 'shared/issuable/feed_buttons' - = render 'shared/new_project_item_select', path: 'issues/new', label: "New issue", type: :issues, with_feature_enabled: 'issues' + = render 'shared/new_project_item_select', path: 'issues/new', label: "New issue", type: :issues, with_feature_enabled: 'issues', with_shared: false, include_projects_in_subgroups: true = render 'shared/issuable/search_bar', type: :issues diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml index e2a317dbf67..a9ce2fe5ab0 100644 --- a/app/views/groups/merge_requests.html.haml +++ b/app/views/groups/merge_requests.html.haml @@ -7,7 +7,7 @@ = render 'shared/issuable/nav', type: :merge_requests - if current_user .nav-controls - = render 'shared/new_project_item_select', path: 'merge_requests/new', label: "New merge request", type: :merge_requests, with_feature_enabled: 'merge_requests' + = render 'shared/new_project_item_select', path: 'merge_requests/new', label: "New merge request", type: :merge_requests, with_feature_enabled: 'merge_requests', with_shared: false, include_projects_in_subgroups: true = render 'shared/issuable/search_bar', type: :merge_requests diff --git a/app/views/shared/_new_project_item_select.html.haml b/app/views/shared/_new_project_item_select.html.haml index 9bc67a7c715..ffa61c9d1a9 100644 --- a/app/views/shared/_new_project_item_select.html.haml +++ b/app/views/shared/_new_project_item_select.html.haml @@ -2,6 +2,6 @@ .project-item-select-holder.btn-group %a.btn.btn-success.new-project-item-link.qa-new-project-item-link{ href: '', data: { label: local_assigns[:label], type: local_assigns[:type] } } = icon('spinner spin') - = project_select_tag :project_path, class: "project-item-select", data: { include_groups: local_assigns[:include_groups], order_by: 'last_activity_at', relative_path: local_assigns[:path] }, with_feature_enabled: local_assigns[:with_feature_enabled] + = project_select_tag :project_path, class: "project-item-select", data: { include_groups: local_assigns[:include_groups], order_by: 'last_activity_at', relative_path: local_assigns[:path], with_shared: local_assigns[:with_shared], include_projects_in_subgroups: local_assigns[:include_projects_in_subgroups] }, with_feature_enabled: local_assigns[:with_feature_enabled] %button.btn.btn-success.new-project-item-select-button.qa-new-project-item-select-button = icon('caret-down') |