diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-19 18:08:39 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-19 18:08:39 +0300 |
commit | e1f8f12bbed19bea753d81d7586b30ea403733d5 (patch) | |
tree | 379d8f092fa416eb1830c2a8208380e438441b72 /app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_tour.vue | |
parent | 235dc61f473cb7f02a9453a59fb26d293e05b092 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_tour.vue')
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_tour.vue | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_tour.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_tour.vue index f6bfb178437..1a2d845fab9 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_tour.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_tour.vue @@ -1,9 +1,10 @@ <script> -import { GlPopover, GlDeprecatedButton } from '@gitlab/ui'; +import { GlPopover, GlDeprecatedButton, GlSprintf, GlLink } from '@gitlab/ui'; import Icon from '~/vue_shared/components/icon.vue'; import Cookies from 'js-cookie'; import { parseBoolean } from '~/lib/utils/common_utils'; import Tracking from '~/tracking'; +import { s__ } from '~/locale'; const trackingMixin = Tracking.mixin(); @@ -14,10 +15,16 @@ export default { dismissTrackValue: 20, showTrackValue: 10, trackEvent: 'click_button', + helpContent: s__( + `mrWidget|Use %{linkStart}CI pipelines to test your code%{linkEnd}, simply add a GitLab CI configuration file to your project. It only takes a minute to make your code more secure and robust.`, + ), + helpURL: 'https://about.gitlab.com/blog/2019/07/12/guide-to-ci-cd-pipelines/', components: { GlPopover, GlDeprecatedButton, Icon, + GlSprintf, + GlLink, }, mixins: [trackingMixin], props: { @@ -97,13 +104,13 @@ export default { <div class="svg-content svg-150 pt-1"> <img :src="pipelineSvgPath" /> </div> - <p> - {{ - s__( - 'mrWidget|Detect issues before deployment with a CI pipeline that continuously tests your code. We created a quick guide that will show you how to create one. Make your code more secure and more robust in just a minute.', - ) - }} - </p> + <gl-sprintf :message="$options.helpContent"> + <template #link="{ content }"> + <gl-link :href="$options.helpURL" target="_blank" class="font-size-inherit">{{ + content + }}</gl-link> + </template> + </gl-sprintf> <gl-deprecated-button ref="ok" category="primary" @@ -116,7 +123,7 @@ export default { :data-track-event="$options.trackEvent" :data-track-label="trackLabel" > - {{ __('Show me how') }} + {{ __('Show me how to add a pipeline') }} </gl-deprecated-button> <gl-deprecated-button ref="no-thanks" @@ -130,7 +137,7 @@ export default { :data-track-label="trackLabel" @click="dismissPopover" > - {{ __("No thanks, don't show this again") }} + {{ __('No thanks') }} </gl-deprecated-button> </gl-popover> </template> |