diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-08-22 08:52:30 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-08-22 08:52:30 +0000 |
| commit | 28501691da41e1593a822061549d29a6a946d7a3 (patch) | |
| tree | 376e74fd2b77d7c269a7f511864611c37f46223f /app/views | |
| parent | c0563b8bf6f22fb72bd3dffe660a21c1fba4684e (diff) | |
| parent | 5bc9dedf401a10388b9505ccbc11d4802ff76a43 (diff) | |
| download | gitlab-ce-28501691da41e1593a822061549d29a6a946d7a3.tar.gz | |
Merge branch '35845-improve-subgroup-creation-permissions' into 'master'
Improves subgroup creation permissions
Closes #35845
See merge request !13418
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/shared/_group_form.html.haml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/views/shared/_group_form.html.haml b/app/views/shared/_group_form.html.haml index 8d5b5129454..2e1bd5a088c 100644 --- a/app/views/shared/_group_form.html.haml +++ b/app/views/shared/_group_form.html.haml @@ -1,6 +1,6 @@ - content_for :page_specific_javascripts do = page_specific_javascript_bundle_tag('group') -- parent = GroupFinder.new(current_user).execute(id: params[:parent_id] || @group.parent_id) +- parent = @group.parent - group_path = root_url - group_path << parent.full_path + '/' if parent @@ -13,13 +13,12 @@ %span>= root_url - if parent %strong= parent.full_path + '/' + = f.hidden_field :parent_id = f.text_field :path, placeholder: 'open-source', class: 'form-control', autofocus: local_assigns[:autofocus] || false, required: true, pattern: Gitlab::PathRegex::NAMESPACE_FORMAT_REGEX_JS, title: 'Please choose a group path with no special characters.', "data-bind-in" => "#{'create_chat_team' if Gitlab.config.mattermost.enabled}" - - if parent - = f.hidden_field :parent_id, value: parent.id - if @group.persisted? .alert.alert-warning.prepend-top-10 |