diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-09-22 19:54:47 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-09-22 19:54:47 +0300 |
| commit | e85e803c0eb6e48dfd9228e718190d95ededf9b1 (patch) | |
| tree | c048fff8ad2b9e0ddef46511f3d66ba75e9ef2dd /app/helpers | |
| parent | 7054afa331bcea591ee73f5ea8decb559b441856 (diff) | |
| parent | a62cc3d1612f648f5988d43e62064f8032c7f8c0 (diff) | |
Merge branch 'dm-group-share-lock-default-help' into 'master'
Inform user that current shared projects will remain shared
Closes #38220
See merge request gitlab-org/gitlab-ce!14441
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/groups_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index e8efe8fab27..82bceddf1f0 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -125,7 +125,7 @@ module GroupsHelper end def default_help - s_("GroupSettings|This setting will be applied to all subgroups unless overridden by a group owner.") + s_("GroupSettings|This setting will be applied to all subgroups unless overridden by a group owner. Groups that already have access to the project will continue to have access unless removed manually.") end def ancestor_locked_but_you_can_override(group) |