diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-30 15:07:29 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-30 15:07:29 +0300 |
| commit | 7cf8c080eda823e7e2577eeed1f96e168c37ee8f (patch) | |
| tree | 25777ab1b8883dd4cff80005a2edc5e385e16714 /app/views | |
| parent | 4381702a8509383c7158a4d89a0ed187532604f2 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml index 677e2bd6007..712f987a783 100644 --- a/app/views/dashboard/merge_requests.html.haml +++ b/app/views/dashboard/merge_requests.html.haml @@ -13,7 +13,7 @@ = render 'shared/new_project_item_vue_select' .top-area - = render 'shared/issuable/nav', type: :merge_requests, display_count: !@no_filters_set + = render 'shared/issuable/nav', type: :merge_requests, display_count: !(@no_filters_set || @search_timeout_occurred) = render 'shared/issuable/search_bar', type: :merge_requests, disable_target_branch: true diff --git a/app/views/protected_branches/shared/_branches_list.html.haml b/app/views/protected_branches/shared/_branches_list.html.haml index c35895e000c..8235411d240 100644 --- a/app/views/protected_branches/shared/_branches_list.html.haml +++ b/app/views/protected_branches/shared/_branches_list.html.haml @@ -22,7 +22,7 @@ %th = s_("ProtectedBranch|Allowed to merge") %th - = s_("ProtectedBranch|Allowed to push") + = s_("ProtectedBranch|Allowed to push and merge") %th = s_("ProtectedBranch|Allowed to force push") %span.has-tooltip{ data: { container: 'body' }, title: s_('ProtectedBranch|Allow all users with push access to force push.'), 'aria-hidden': 'true' } diff --git a/app/views/protected_branches/shared/_create_protected_branch.html.haml b/app/views/protected_branches/shared/_create_protected_branch.html.haml index 315daa5e029..109d92af8a7 100644 --- a/app/views/protected_branches/shared/_create_protected_branch.html.haml +++ b/app/views/protected_branches/shared/_create_protected_branch.html.haml @@ -25,7 +25,7 @@ .col-sm-12 = yield :merge_access_levels .form-group.row - = f.label :push_access_levels_attributes, s_("ProtectedBranch|Allowed to push:"), class: 'col-sm-12' + = f.label :push_access_levels_attributes, s_("ProtectedBranch|Allowed to push and merge:"), class: 'col-sm-12' .col-sm-12 = yield :push_access_levels .form-group.row |