提交 fffced70 编写于 作者: G GitLab Bot

Add latest changes from gitlab-org/gitlab@master

上级 f21dc6a9
<script> <script>
import { GlLink, GlModalDirective, GlSprintf, GlButton } from '@gitlab/ui'; import { GlLink, GlModalDirective, GlSprintf, GlButton, GlAlert } from '@gitlab/ui';
import { s__, __, sprintf } from '~/locale'; import { s__, __, sprintf } from '~/locale';
import eventHub from '../event_hub'; import eventHub from '../event_hub';
import identicon from '../../vue_shared/components/identicon.vue'; import identicon from '../../vue_shared/components/identicon.vue';
...@@ -14,6 +14,7 @@ export default { ...@@ -14,6 +14,7 @@ export default {
GlButton, GlButton,
identicon, identicon,
GlLink, GlLink,
GlAlert,
GlSprintf, GlSprintf,
UninstallApplicationButton, UninstallApplicationButton,
UninstallApplicationConfirmationModal, UninstallApplicationConfirmationModal,
...@@ -381,12 +382,14 @@ export default { ...@@ -381,12 +382,14 @@ export default {
</template> </template>
</div> </div>
<div <gl-alert
v-if="updateFailed && !isUpdating" 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 }} {{ updateFailureDescription }}
</div> </gl-alert>
<template v-if="updateAvailable || updateFailed || isUpdating"> <template v-if="updateAvailable || updateFailed || isUpdating">
<template v-if="updatingNeedsConfirmation"> <template v-if="updatingNeedsConfirmation">
<gl-button <gl-button
......
...@@ -16155,6 +16155,15 @@ msgstr "" ...@@ -16155,6 +16155,15 @@ msgstr ""
msgid "NetworkPolicies|%{number} selected" msgid "NetworkPolicies|%{number} selected"
msgstr "" msgstr ""
msgid "NetworkPolicies|%{strongOpen}all%{strongClose} pods"
msgstr ""
msgid "NetworkPolicies|%{strongOpen}any%{strongClose} port"
msgstr ""
msgid "NetworkPolicies|.yaml"
msgstr ""
msgid "NetworkPolicies|.yaml mode" msgid "NetworkPolicies|.yaml mode"
msgstr "" msgstr ""
...@@ -16164,6 +16173,12 @@ msgstr "" ...@@ -16164,6 +16173,12 @@ msgstr ""
msgid "NetworkPolicies|All selected" msgid "NetworkPolicies|All selected"
msgstr "" 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." msgid "NetworkPolicies|Choose whether to enforce this policy."
msgstr "" msgstr ""
...@@ -16173,6 +16188,9 @@ msgstr "" ...@@ -16173,6 +16188,9 @@ msgstr ""
msgid "NetworkPolicies|Define this policy's location, conditions and actions." msgid "NetworkPolicies|Define this policy's location, conditions and actions."
msgstr "" msgstr ""
msgid "NetworkPolicies|Deny all traffic"
msgstr ""
msgid "NetworkPolicies|Description" msgid "NetworkPolicies|Description"
msgstr "" msgstr ""
...@@ -16242,6 +16260,9 @@ msgstr "" ...@@ -16242,6 +16260,9 @@ msgstr ""
msgid "NetworkPolicies|Policy type" msgid "NetworkPolicies|Policy type"
msgstr "" msgstr ""
msgid "NetworkPolicies|Rule"
msgstr ""
msgid "NetworkPolicies|Rule mode" msgid "NetworkPolicies|Rule mode"
msgstr "" msgstr ""
...@@ -16260,6 +16281,12 @@ msgstr "" ...@@ -16260,6 +16281,12 @@ msgstr ""
msgid "NetworkPolicies|YAML editor" msgid "NetworkPolicies|YAML editor"
msgstr "" msgstr ""
msgid "NetworkPolicies|all DNS names"
msgstr ""
msgid "NetworkPolicies|all IP addresses"
msgstr ""
msgid "NetworkPolicies|any pod" msgid "NetworkPolicies|any pod"
msgstr "" msgstr ""
...@@ -16275,15 +16302,24 @@ msgstr "" ...@@ -16275,15 +16302,24 @@ msgstr ""
msgid "NetworkPolicies|inbound to" msgid "NetworkPolicies|inbound to"
msgstr "" msgstr ""
msgid "NetworkPolicies|nowhere"
msgstr ""
msgid "NetworkPolicies|outbound from" msgid "NetworkPolicies|outbound from"
msgstr "" msgstr ""
msgid "NetworkPolicies|pod with labels" msgid "NetworkPolicies|pod with labels"
msgstr "" msgstr ""
msgid "NetworkPolicies|pods %{pods}"
msgstr ""
msgid "NetworkPolicies|pods with labels" msgid "NetworkPolicies|pods with labels"
msgstr "" msgstr ""
msgid "NetworkPolicies|ports %{ports}"
msgstr ""
msgid "NetworkPolicies|ports/protocols" msgid "NetworkPolicies|ports/protocols"
msgstr "" msgstr ""
...@@ -28778,6 +28814,9 @@ msgstr "" ...@@ -28778,6 +28814,9 @@ msgstr ""
msgid "among other things" msgid "among other things"
msgstr "" msgstr ""
msgid "and"
msgstr ""
msgid "any-approver for the merge request already exists" msgid "any-approver for the merge request already exists"
msgstr "" msgstr ""
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册