diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-09-07 18:29:47 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-09-07 18:29:47 +0000 |
| commit | 22d6e69ecf004060de31823a8242d249a88c4e46 (patch) | |
| tree | c83345b5ee54b32268ca70daedcbdc058ad25ca6 /app/views/groups | |
| parent | 6a4ebc4a9bbc93d627f9da0091dd5050db1a916b (diff) | |
| parent | 95f4dd4f1501f3901908f444790eea06f3d703bb (diff) | |
| download | gitlab-ce-22d6e69ecf004060de31823a8242d249a88c4e46.tar.gz | |
Merge branch 'improve-share-locking-feature-for-subgroups' into 'master'
Improve "Share with group lock" feature for subgroups
Closes #30550
See merge request !13944
Diffstat (limited to 'app/views/groups')
| -rw-r--r-- | app/views/groups/edit.html.haml | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml index 839f23e69fd..0d3308833b7 100644 --- a/app/views/groups/edit.html.haml +++ b/app/views/groups/edit.html.haml @@ -28,17 +28,20 @@ .col-sm-offset-2.col-sm-10 = render 'shared/allow_request_access', form: f - = render 'group_admin_settings', f: f - .form-group - %hr - = f.label :share_with_group_lock, class: 'control-label' do - Share with group lock + %label.control-label + = s_("GroupSettings|Share with group lock") .col-sm-10 .checkbox - = f.check_box :share_with_group_lock - %span.descr Prevent sharing a project with another group within this group + = f.label :share_with_group_lock do + = f.check_box :share_with_group_lock, disabled: !can_change_share_with_group_lock?(@group) + %strong + - group_link = link_to @group.name, group_path(@group) + = s_("GroupSettings|Prevent sharing a project within %{group} with other groups").html_safe % { group: group_link } + %br + %span.descr= share_with_group_lock_help_text(@group) + = render 'group_admin_settings', f: f .form-actions = f.submit 'Save group', class: "btn btn-save" |