Merge branch 'ar-fix-border-color' into 'master'

Fix protected branches/tags border

See merge request gitlab-org/gitlab!52816

app/assets/javascripts/protected_tags/protected_tag_edit.js

-import { __ } from '~/locale';
+import { s__ } from '~/locale';
 import { deprecatedCreateFlash as flash } from '../flash';
 import axios from '../lib/utils/axios_utils';
 import ProtectedTagAccessDropdown from './protected_tag_access_dropdown';
@@ -48,11 +48,8 @@ export default class ProtectedTagEdit {
       .catch(() => {
         this.$allowedToCreateDropdownButton.enable();
 
-        flash(
-          __('Failed to update tag!'),
-          'alert',
-          document.querySelector('.js-protected-tags-list'),
-        );
+        window.scrollTo({ top: 0, behavior: 'smooth' });
+        flash(s__('ProjectSettings|Failed to update tag!'));
       });
   }
 }

app/assets/stylesheets/framework/tables.scss

@@ -69,9 +69,6 @@ table {
         }
       }
 
-      td {
-        border-color: $white-normal;
-      }
     }
 
     .thead-white {

app/views/projects/protected_tags/shared/_tags_list.html.haml

@@ -23,7 +23,6 @@
             %th
       %tbody
         %tr
-          %td.flash-container{ colspan: 4 }
         = yield
 
     = paginate @protected_tags, theme: 'gitlab'

changelogs/unreleased/ar-fix-border-color.yml

+---
+title: Fix protected branches/tags border
+merge_request: 52816
+author:
+type: changed

locale/gitlab.pot

@@ -12297,9 +12297,6 @@ msgstr ""
 msgid "Failed to update issues, please try again."
 msgstr ""
 
-msgid "Failed to update tag!"
-msgstr ""
-
 msgid "Failed to update the Canary Ingress."
 msgstr ""