summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Kozono <mkozono@gmail.com>2017-08-30 16:56:44 -0700
committerMichael Kozono <mkozono@gmail.com>2017-09-06 12:07:19 -0700
commit19e0d36eb81479a9884928f27b6e95c5f8206eda (patch)
tree50dd49ee894f6488398f4fdd134064fcedfde3be
parent0a8083c4f1605a17e52137c6da6d8748be1d98df (diff)
downloadgitlab-ce-19e0d36eb81479a9884928f27b6e95c5f8206eda.tar.gz
Move share lock setting and tweak UI
-rw-r--r--app/views/groups/edit.html.haml17
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..b53f0b90b9c 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
+ = f.label :share_with_group_lock, 'Share lock', class: 'control-label'
.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
+ %strong
+ Prevent sharing a project within
+ = @group.name
+ with other groups
+ %br/
+ %span.descr This setting will be applied to all subgroups unless overridden by a group owner
+ = render 'group_admin_settings', f: f
.form-actions
= f.submit 'Save group', class: "btn btn-save"