diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-26 00:08:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-26 00:08:06 +0300 |
commit | e1549c75843d235607aebac9ed64f2fd10e549ed (patch) | |
tree | d6b4213b87b57b323464c7e5c1b75091212f3373 /app | |
parent | 5d75b2b9a9d11c20667895e6aa68ea4e76658c5d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
4 files changed, 15 insertions, 15 deletions
diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue index 576a9bc7743..f4d37c8c5f3 100644 --- a/app/assets/javascripts/clusters/components/applications.vue +++ b/app/assets/javascripts/clusters/components/applications.vue @@ -1,5 +1,5 @@ <script> -import _ from 'underscore'; +import { escape as esc } from 'lodash'; import helmInstallIllustration from '@gitlab/svgs/dist/illustrations/kubernetes-installation.svg'; import { GlLoadingIcon } from '@gitlab/ui'; import elasticsearchLogo from 'images/cluster_app_logos/elasticsearch.png'; @@ -130,7 +130,7 @@ export default { }, ingressDescription() { return sprintf( - _.escape( + esc( s__( `ClusterIntegration|Installing Ingress may incur additional costs. Learn more about %{pricingLink}.`, ), @@ -138,14 +138,14 @@ export default { { pricingLink: `<a href="https://cloud.google.com/compute/pricing#lb" target="_blank" rel="noopener noreferrer"> - ${_.escape(s__('ClusterIntegration|pricing'))}</a>`, + ${esc(s__('ClusterIntegration|pricing'))}</a>`, }, false, ); }, certManagerDescription() { return sprintf( - _.escape( + esc( s__( `ClusterIntegration|Cert-Manager is a native Kubernetes certificate management controller that helps with issuing certificates. Installing Cert-Manager on your cluster will issue a certificate by %{letsEncrypt} and ensure that certificates @@ -155,14 +155,14 @@ export default { { letsEncrypt: `<a href="https://letsencrypt.org/" target="_blank" rel="noopener noreferrer"> - ${_.escape(s__("ClusterIntegration|Let's Encrypt"))}</a>`, + ${esc(s__("ClusterIntegration|Let's Encrypt"))}</a>`, }, false, ); }, crossplaneDescription() { return sprintf( - _.escape( + esc( s__( `ClusterIntegration|Crossplane enables declarative provisioning of managed services from your cloud of choice using %{kubectl} or %{gitlabIntegrationLink}. Crossplane runs inside your Kubernetes cluster and supports secure connectivity and secrets management between app containers and the cloud services they depend on.`, @@ -171,7 +171,7 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity { gitlabIntegrationLink: `<a href="https://docs.gitlab.com/ee/user/clusters/applications.html#crossplane" target="_blank" rel="noopener noreferrer"> - ${_.escape(s__('ClusterIntegration|Gitlab Integration'))}</a>`, + ${esc(s__('ClusterIntegration|Gitlab Integration'))}</a>`, kubectl: `<code>kubectl</code>`, }, false, @@ -180,7 +180,7 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity prometheusDescription() { return sprintf( - _.escape( + esc( s__( `ClusterIntegration|Prometheus is an open-source monitoring system with %{gitlabIntegrationLink} to monitor deployed applications.`, @@ -189,7 +189,7 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity { gitlabIntegrationLink: `<a href="https://docs.gitlab.com/ce/user/project/integrations/prometheus.html" target="_blank" rel="noopener noreferrer"> - ${_.escape(s__('ClusterIntegration|GitLab Integration'))}</a>`, + ${esc(s__('ClusterIntegration|GitLab Integration'))}</a>`, }, false, ); @@ -215,11 +215,11 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity installedVia() { if (this.cloudRun) { return sprintf( - _.escape(s__(`ClusterIntegration|installed via %{installed_via}`)), + esc(s__(`ClusterIntegration|installed via %{installed_via}`)), { installed_via: `<a href="${ this.cloudRunHelpPath - }" target="_blank" rel="noopener noreferrer">${_.escape( + }" target="_blank" rel="noopener noreferrer">${esc( s__('ClusterIntegration|Cloud Run'), )}</a>`, }, diff --git a/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue b/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue index c31ba7ef14a..bdbaf2ed558 100644 --- a/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue +++ b/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue @@ -1,5 +1,5 @@ <script> -import _ from 'underscore'; +import { escape as esc } from 'lodash'; import SplitButton from '~/vue_shared/components/split_button.vue'; import { GlModal, GlButton, GlFormInput } from '@gitlab/ui'; import { s__, sprintf } from '~/locale'; @@ -82,7 +82,7 @@ export default { ) : s__('ClusterIntegration|To remove your integration, type %{clusterName} to confirm:'), { - clusterName: `<code>${_.escape(this.clusterName)}</code>`, + clusterName: `<code>${esc(this.clusterName)}</code>`, }, false, ); diff --git a/app/helpers/broadcast_messages_helper.rb b/app/helpers/broadcast_messages_helper.rb index 0c32b48a85a..881e11b10ea 100644 --- a/app/helpers/broadcast_messages_helper.rb +++ b/app/helpers/broadcast_messages_helper.rb @@ -47,7 +47,7 @@ module BroadcastMessagesHelper end def render_broadcast_message(broadcast_message) - if Feature.enabled?(:broadcast_message_placeholders) + if broadcast_message.notification? Banzai.render_field_and_post_process(broadcast_message, :message, { current_user: current_user, skip_project_check: true, diff --git a/app/services/merge_requests/build_service.rb b/app/services/merge_requests/build_service.rb index 456cc589477..80991657688 100644 --- a/app/services/merge_requests/build_service.rb +++ b/app/services/merge_requests/build_service.rb @@ -220,7 +220,7 @@ module MergeRequests def append_closes_description return unless issue&.to_reference.present? - closes_issue = "Closes #{issue.to_reference}" + closes_issue = "#{target_project.autoclose_referenced_issues ? 'Closes' : 'Related to'} #{issue.to_reference}" if description.present? descr_parts = [merge_request.description, closes_issue] |