diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 18:09:01 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 18:09:01 +0300 |
commit | b304a72312465ed4c0a568ee6a6ea5e97f705c9b (patch) | |
tree | a2f25dbea26c81e88b169c55a6275e3969323e82 /app/assets/javascripts/vue_merge_request_widget/components | |
parent | b84eeb256c4a780d902faee1f99ca9a711b3214a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components')
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue | 2 | ||||
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/mr_widget_suggest_pipeline.vue | 45 |
2 files changed, 46 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue index 2aaba6e1c8a..7c71463c949 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue @@ -77,7 +77,7 @@ export default { }; </script> <template> - <div class="mr-source-target append-bottom-default"> + <div class="d-flex mr-source-target append-bottom-default"> <mr-widget-icon name="git-merge" /> <div class="git-merge-container d-flex"> <div class="normal"> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_suggest_pipeline.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_suggest_pipeline.vue new file mode 100644 index 00000000000..f08bfb3a90f --- /dev/null +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_suggest_pipeline.vue @@ -0,0 +1,45 @@ +<script> +import { GlLink, GlSprintf } from '@gitlab/ui'; +import MrWidgetIcon from './mr_widget_icon.vue'; + +export default { + name: 'MRWidgetSuggestPipeline', + iconName: 'status_notfound', + components: { + GlLink, + GlSprintf, + MrWidgetIcon, + }, + props: { + pipelinePath: { + type: String, + required: true, + }, + }, +}; +</script> +<template> + <div class="d-flex mr-pipeline-suggest append-bottom-default"> + <mr-widget-icon :name="$options.iconName" /> + <gl-sprintf + class="js-no-pipeline-message" + :message=" + s__(`mrWidget|%{prefixToLinkStart}No pipeline%{prefixToLinkEnd} + %{addPipelineLinkStart}Add the .gitlab-ci.yml file%{addPipelineLinkEnd} + to create one.`) + " + > + <template #prefixToLink="{content}"> + <strong> + {{ content }} + </strong> + </template> + <template #addPipelineLink="{content}"> + <gl-link :href="pipelinePath" class="ml-2"> + {{ content }} + </gl-link> + + </template> + </gl-sprintf> + </div> +</template> |