Remove allowed to merge from code owner protection tooltip

4d50a320 · Marc Shaw · d9cba039 · 4d50a320 · 4d50a320
Commit 4d50a320 authored Oct 15, 2020 by Marc Shaw
Showing with 3 additions and 3 deletions

ee/app/views/projects/protected_branches/ee/_code_owner_approval_table_head.html.haml ...ted_branches/ee/_code_owner_approval_table_head.html.haml +2 -2

locale/gitlab.pot locale/gitlab.pot +1 -1

No files found.
--- a/ee/app/views/projects/protected_branches/ee/_code_owner_approval_table_head.html.haml
+++ b/ee/app/views/projects/protected_branches/ee/_code_owner_approval_table_head.html.haml
@@ -2,6 +2,6 @@
  %th
    = s_("ProtectedBranch|Code owner approval")
    %span.sr-only
-      = "(" << s_("ProtectedBranch|Does not apply to users allowed to merge or push.") << ")"
+      = "(" << s_("ProtectedBranch|Does not apply to users allowed to push.") << ")"
-    %span.has-tooltip{ data: { container: 'body' }, title: s_('ProtectedBranch|Does not apply to users allowed to merge or push.'), 'aria-hidden': 'true' }
+    %span.has-tooltip{ data: { container: 'body' }, title: s_('ProtectedBranch|Does not apply to users allowed to push.'), 'aria-hidden': 'true' }
      = sprite_icon('question', size: 16, css_class: 'gl-text-gray-500')
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -21236,7 +21236,7 @@ msgstr ""
 msgid "ProtectedBranch|Code owner approval"
 msgstr ""
-msgid "ProtectedBranch|Does not apply to users allowed to merge or push."
+msgid "ProtectedBranch|Does not apply to users allowed to push."
 msgstr ""
 msgid "ProtectedBranch|Protect"