diff options
| author | Scott Hampton <shampton@gitlab.com> | 2018-12-05 21:36:18 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-12-05 21:36:18 +0000 |
| commit | a611eab9422b3e9038aa7649f77f0dcc3da0f2d0 (patch) | |
| tree | 0290b47bf62b5387f129eba689e69b25af9b73b7 /app/assets/javascripts/pipelines/components | |
| parent | cfe484795d4ddb8c7b3247802547e3da74c64cf2 (diff) | |
| download | gitlab-ce-a611eab9422b3e9038aa7649f77f0dcc3da0f2d0.tar.gz | |
Resolve "Include tags into pipeline detail view"
Diffstat (limited to 'app/assets/javascripts/pipelines/components')
| -rw-r--r-- | app/assets/javascripts/pipelines/components/pipeline_url.vue | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/assets/javascripts/pipelines/components/pipeline_url.vue b/app/assets/javascripts/pipelines/components/pipeline_url.vue index e5924d3a77e..30a5bbf92ce 100644 --- a/app/assets/javascripts/pipelines/components/pipeline_url.vue +++ b/app/assets/javascripts/pipelines/components/pipeline_url.vue @@ -65,7 +65,7 @@ export default { v-if="pipeline.flags.latest" v-gl-tooltip class="js-pipeline-url-latest badge badge-success" - title="Latest pipeline for this branch" + title="__('Latest pipeline for this branch')" > latest </span> @@ -97,6 +97,14 @@ export default { <span v-if="pipeline.flags.stuck" class="js-pipeline-url-stuck badge badge-warning"> stuck </span> + <span + v-if="pipeline.flags.merge_request" + v-gl-tooltip + title="__('This pipeline is run in a merge request context')" + class="js-pipeline-url-mergerequest badge badge-info" + > + merge request + </span> </div> </div> </template> |