diff options
author | Chris Baumbauer <cab@cabnetworks.net> | 2018-11-21 11:20:18 -0800 |
---|---|---|
committer | Chris Baumbauer <cab@cabnetworks.net> | 2018-11-26 10:55:16 -0800 |
commit | fba741fada0af1a710d55d6215ab28d3d7bce4fd (patch) | |
tree | ef54d6fefe78ed350748ec63cdbe1280f4283be4 | |
parent | fbbe5ccd1be471a203185c172c51b7137b73f170 (diff) | |
download | gitlab-ce-fba741fada0af1a710d55d6215ab28d3d7bce4fd.tar.gz |
Reword Knative cluster application
-rw-r--r-- | app/assets/javascripts/clusters/components/applications.vue | 17 | ||||
-rw-r--r-- | changelogs/unreleased/triggermesh-phase2-knative-description.yml | 5 | ||||
-rw-r--r-- | locale/gitlab.pot | 6 |
3 files changed, 14 insertions, 14 deletions
diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue index fcdbffbc8b8..16acb4c3153 100644 --- a/app/assets/javascripts/clusters/components/applications.vue +++ b/app/assets/javascripts/clusters/components/applications.vue @@ -296,11 +296,7 @@ export default { class="hide-bottom-border rounded-bottom" title-link="https://cert-manager.readthedocs.io/en/latest/#" > - <div - slot="description" - v-html="certManagerDescription" - > - </div> + <div slot="description" v-html="certManagerDescription"></div> </application-row> <application-row v-if="isProjectCluster" @@ -412,12 +408,11 @@ export default { <div slot="description"> <p> {{ - s__(`ClusterIntegration|A Knative build extends Kubernetes - and utilizes existing Kubernetes primitives to provide you with - the ability to run on-cluster container builds from source. - For example, you can write a build that uses Kubernetes-native - resources to obtain your source code from a repository, - build it into container a image, and then run that image.`) + s__(`ClusterIntegration|Knative (pronounced kay-nay-tiv) extends + Kubernetes to provide a set of middleware components that are + essential to build modern, source-centric, and container-based + applications that can run anywhere: on premises, in the cloud, or + even in a third-party data center.`) }} </p> diff --git a/changelogs/unreleased/triggermesh-phase2-knative-description.yml b/changelogs/unreleased/triggermesh-phase2-knative-description.yml new file mode 100644 index 00000000000..c6cee1984d5 --- /dev/null +++ b/changelogs/unreleased/triggermesh-phase2-knative-description.yml @@ -0,0 +1,5 @@ +--- +title: Modify the wording for the knative cluster application to match upstream +merge_request: 23289 +author: Chris Baumbauer +type: fixed diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 3a8716b04e7..d266d776e6c 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -1370,9 +1370,6 @@ msgstr "" msgid "ClusterIntegration|%{boldNotice} This will add some extra resources like a load balancer, which may incur additional costs depending on the hosting provider your Kubernetes cluster is installed on. If you are using Google Kubernetes Engine, you can %{pricingLink}." msgstr "" -msgid "ClusterIntegration|A Knative build extends Kubernetes and utilizes existing Kubernetes primitives to provide you with the ability to run on-cluster container builds from source. For example, you can write a build that uses Kubernetes-native resources to obtain your source code from a repository, build it into container a image, and then run that image." -msgstr "" - msgid "ClusterIntegration|API URL" msgstr "" @@ -1541,6 +1538,9 @@ msgstr "" msgid "ClusterIntegration|Knative" msgstr "" +msgid "ClusterIntegration|Knative (pronounced kay-nay-tiv) extends Kubernetes to provide a set of middleware components that are essential to build modern, source-centric, and container-based applications that can run anywhere: on premises, in the cloud, or even in a third-party data center." +msgstr "" + msgid "ClusterIntegration|Knative Domain Name:" msgstr "" |