diff options
| author | Mark Chao <mchao@gitlab.com> | 2018-05-22 18:16:28 +0800 |
|---|---|---|
| committer | Mark Chao <mchao@gitlab.com> | 2018-06-06 21:01:43 +0900 |
| commit | dc28ef0154fd31b6a284e9756a76b3c3bd4db5f4 (patch) | |
| tree | da4582a4b39af84dfe4c959f37cb933b700718f5 | |
| parent | d5a303cf4d1d0182bb5462ca85beb29a5a821700 (diff) | |
| download | gitlab-ce-dc28ef0154fd31b6a284e9756a76b3c3bd4db5f4.tar.gz | |
View update
3 files changed, 4 insertions, 4 deletions
diff --git a/app/views/projects/project_members/index.html.haml b/app/views/projects/project_members/index.html.haml index a56023e98cd..43848d674c2 100644 --- a/app/views/projects/project_members/index.html.haml +++ b/app/views/projects/project_members/index.html.haml @@ -12,7 +12,7 @@ - else %p Members can be added by project - %i Masters + %i Maintainers or %i Owners .light diff --git a/app/views/projects/protected_branches/shared/_index.html.haml b/app/views/projects/protected_branches/shared/_index.html.haml index fd5c1aa342a..846f8858d14 100644 --- a/app/views/projects/protected_branches/shared/_index.html.haml +++ b/app/views/projects/protected_branches/shared/_index.html.haml @@ -12,8 +12,8 @@ %p By default, protected branches are designed to: %ul - %li prevent their creation, if not already created, from everybody except Masters - %li prevent pushes from everybody except Masters + %li prevent their creation, if not already created, from everybody except Maintainers + %li prevent pushes from everybody except Maintainers %li prevent <strong>anyone</strong> from force pushing to the branch %li prevent <strong>anyone</strong> from deleting the branch %p Read more about #{link_to "protected branches", help_page_path("user/project/protected_branches")} and #{link_to "project permissions", help_page_path("user/permissions")}. diff --git a/app/views/projects/protected_tags/shared/_index.html.haml b/app/views/projects/protected_tags/shared/_index.html.haml index c33723d8072..fe2903b456f 100644 --- a/app/views/projects/protected_tags/shared/_index.html.haml +++ b/app/views/projects/protected_tags/shared/_index.html.haml @@ -12,7 +12,7 @@ %p By default, protected tags are designed to: %ul - %li Prevent tag creation by everybody except Masters + %li Prevent tag creation by everybody except Maintainers %li Prevent <strong>anyone</strong> from updating the tag %li Prevent <strong>anyone</strong> from deleting the tag |