Add latest changes from gitlab-org/gitlab@master

2 files changed, 46 insertions, 4 deletions

diff --git a/app/assets/javascripts/clusters/components/application_row.vue b/app/assets/javascripts/clusters/components/application_row.vue
index 3b285e3bc31..412260da958 100644
--- a/app/assets/javascripts/clusters/components/application_row.vue
+++ b/app/assets/javascripts/clusters/components/application_row.vue
@@ -1,5 +1,5 @@
 <script>
-import { GlLink, GlModalDirective, GlSprintf, GlButton } from '@gitlab/ui';
+import { GlLink, GlModalDirective, GlSprintf, GlButton, GlAlert } from '@gitlab/ui';
 import { s__, __, sprintf } from '~/locale';
 import eventHub from '../event_hub';
 import identicon from '../../vue_shared/components/identicon.vue';
@@ -14,6 +14,7 @@ export default {
     GlButton,
     identicon,
     GlLink,
+    GlAlert,
     GlSprintf,
     UninstallApplicationButton,
     UninstallApplicationConfirmationModal,
@@ -381,12 +382,14 @@ export default {
             </template>
           </div>
 
-          <div
+          <gl-alert
             v-if="updateFailed && !isUpdating"
-            class="bs-callout bs-callout-danger cluster-application-banner mt-2 mb-0 js-cluster-application-update-details"
+            variant="danger"
+            :dismissible="false"
+            class="gl-mt-3 gl-mb-0 js-cluster-application-update-details"
           >
             {{ updateFailureDescription }}
-          </div>
+          </gl-alert>
           <template v-if="updateAvailable || updateFailed || isUpdating">
             <template v-if="updatingNeedsConfirmation">
               <gl-button
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index cad8e5923f6..411cbdd5097 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -16155,6 +16155,15 @@ msgstr ""
 msgid "NetworkPolicies|%{number} selected"
 msgstr ""
 
+msgid "NetworkPolicies|%{strongOpen}all%{strongClose} pods"
+msgstr ""
+
+msgid "NetworkPolicies|%{strongOpen}any%{strongClose} port"
+msgstr ""
+
+msgid "NetworkPolicies|.yaml"
+msgstr ""
+
 msgid "NetworkPolicies|.yaml mode"
 msgstr ""
 
@@ -16164,6 +16173,12 @@ msgstr ""
 msgid "NetworkPolicies|All selected"
 msgstr ""
 
+msgid "NetworkPolicies|Allow all inbound traffic to %{selector} from %{ruleSelector} on %{ports}"
+msgstr ""
+
+msgid "NetworkPolicies|Allow all outbound traffic from %{selector} to %{ruleSelector} on %{ports}"
+msgstr ""
+
 msgid "NetworkPolicies|Choose whether to enforce this policy."
 msgstr ""
 
@@ -16173,6 +16188,9 @@ msgstr ""
 msgid "NetworkPolicies|Define this policy's location, conditions and actions."
 msgstr ""
 
+msgid "NetworkPolicies|Deny all traffic"
+msgstr ""
+
 msgid "NetworkPolicies|Description"
 msgstr ""
 
@@ -16242,6 +16260,9 @@ msgstr ""
 msgid "NetworkPolicies|Policy type"
 msgstr ""
 
+msgid "NetworkPolicies|Rule"
+msgstr ""
+
 msgid "NetworkPolicies|Rule mode"
 msgstr ""
 
@@ -16260,6 +16281,12 @@ msgstr ""
 msgid "NetworkPolicies|YAML editor"
 msgstr ""
 
+msgid "NetworkPolicies|all DNS names"
+msgstr ""
+
+msgid "NetworkPolicies|all IP addresses"
+msgstr ""
+
 msgid "NetworkPolicies|any pod"
 msgstr ""
 
@@ -16275,15 +16302,24 @@ msgstr ""
 msgid "NetworkPolicies|inbound to"
 msgstr ""
 
+msgid "NetworkPolicies|nowhere"
+msgstr ""
+
 msgid "NetworkPolicies|outbound from"
 msgstr ""
 
 msgid "NetworkPolicies|pod with labels"
 msgstr ""
 
+msgid "NetworkPolicies|pods %{pods}"
+msgstr ""
+
 msgid "NetworkPolicies|pods with labels"
 msgstr ""
 
+msgid "NetworkPolicies|ports %{ports}"
+msgstr ""
+
 msgid "NetworkPolicies|ports/protocols"
 msgstr ""
 
@@ -28778,6 +28814,9 @@ msgstr ""
 msgid "among other things"
 msgstr ""
 
+msgid "and"
+msgstr ""
+
 msgid "any-approver for the merge request already exists"
 msgstr ""