diff options
| author | Sytse Sijbrandij <sytse@gitlab.com> | 2014-10-12 14:54:36 +0200 |
|---|---|---|
| committer | Sytse Sijbrandij <sytse@gitlab.com> | 2014-10-12 14:54:36 +0200 |
| commit | c9c6f77ec151260f8155e48e123083588228fc1c (patch) | |
| tree | 74645eb72da34f10ac83dc004d0916752929c57f | |
| parent | f7342ce56764aaf6465bca74239955778c25107b (diff) | |
| parent | ab64ca7a11becad2ca32fdb7ef0530437aa361d9 (diff) | |
| download | gitlab-ce-c9c6f77ec151260f8155e48e123083588228fc1c.tar.gz | |
Merge pull request #7915 from bbodenmiller/patch-12
improve wording on protected branches page
| -rw-r--r-- | app/views/projects/protected_branches/index.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/protected_branches/index.html.haml b/app/views/projects/protected_branches/index.html.haml index 49a3ef4c8a7..227a2f9a061 100644 --- a/app/views/projects/protected_branches/index.html.haml +++ b/app/views/projects/protected_branches/index.html.haml @@ -1,13 +1,13 @@ %h3.page-title Protected branches -%p.light This ability keeps stable branches secure and forces developers to use code reviews +%p.light Keep stable branches secure and force developers to use Merge Requests %hr .bs-callout.bs-callout-info %p Protected branches are designed to %ul %li prevent pushes from everybody except #{link_to "masters", help_page_path("permissions", "permissions"), class: "vlink"} - %li prevents anyone from force pushing to the branch - %li prevents anyone from deleting the branch + %li prevent anyone from force pushing to the branch + %li prevent anyone from deleting the branch %p Read more about #{link_to "project permissions", help_page_path("permissions", "permissions"), class: "underlined-link"} - if can? current_user, :admin_project, @project |