diff --git a/app/assets/javascripts/protected_tags/protected_tag_edit.js b/app/assets/javascripts/protected_tags/protected_tag_edit.js index 624067a5a094d58f354a9c9889524505eeefa425..09a387c0f9e17b3e4394a1d474ad8dae0354da45 100644 --- a/app/assets/javascripts/protected_tags/protected_tag_edit.js +++ b/app/assets/javascripts/protected_tags/protected_tag_edit.js @@ -43,7 +43,7 @@ export default class ProtectedTagEdit { }, }, error() { - new Flash('Failed to update tag!'); + new Flash('Failed to update tag!', null, $('.js-protected-tags-list')); }, }).always(() => { this.$allowedToCreateDropdownButton.enable(); diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 61b973e0aa9e735a717885ce31d142db90ed3266..717ebb44a2317e430929ebb44b091045f19cab64 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -782,6 +782,10 @@ pre.light-well { width: 100%; max-width: 300px; } + + .flash-container { + padding: 0; + } } .custom-notifications-form { diff --git a/app/views/projects/protected_tags/_tags_list.html.haml b/app/views/projects/protected_tags/_tags_list.html.haml index cc006ed8a0bc802bb47ed0163c335eed0b5e1c3a..728afd75b5056d0ae10a46d546fb58cfda3c65dc 100644 --- a/app/views/projects/protected_tags/_tags_list.html.haml +++ b/app/views/projects/protected_tags/_tags_list.html.haml @@ -1,4 +1,4 @@ -.panel.panel-default.protected-tags-list +.panel.panel-default.protected-tags-list.js-protected-tags-list - if @protected_tags.empty? .panel-heading %h3.panel-title @@ -21,6 +21,8 @@ - if can_admin_project %th %tbody + %tr + %td.flash-container{ colspan: 4 } = render partial: 'projects/protected_tags/protected_tag', collection: @protected_tags, locals: { can_admin_project: can_admin_project} = paginate @protected_tags, theme: 'gitlab'