summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2019-08-22 10:20:27 +0000
committerFilipa Lacerda <filipa@gitlab.com>2019-08-22 10:20:27 +0000
commit34bf7df0ffd4c872b631f67fd9337930a9e40683 (patch)
tree482a6185260754a0d0881e7cea2e8247dc256913
parente356ceae8c70f5d21f5b33cee389945ece4263d9 (diff)
parentb9e21ad86fd176b5388c7b37d250d5ec60bc9abe (diff)
downloadgitlab-ce-34bf7df0ffd4c872b631f67fd9337930a9e40683.tar.gz
Merge branch 'latest-pipeline' into 'master'
Updated latest pipeline tag tooltip to be more descriptive See merge request gitlab-org/gitlab-ce!31624
-rw-r--r--app/assets/javascripts/pipelines/components/pipeline_url.vue2
-rw-r--r--app/views/projects/pipelines/_info.html.haml2
-rw-r--r--changelogs/unreleased/latest-pipeline.yml5
-rw-r--r--locale/gitlab.pot2
4 files changed, 8 insertions, 3 deletions
diff --git a/app/assets/javascripts/pipelines/components/pipeline_url.vue b/app/assets/javascripts/pipelines/components/pipeline_url.vue
index 4efc1d2408a..a08f732dda7 100644
--- a/app/assets/javascripts/pipelines/components/pipeline_url.vue
+++ b/app/assets/javascripts/pipelines/components/pipeline_url.vue
@@ -67,7 +67,7 @@ export default {
<span
v-if="pipeline.flags.latest"
v-gl-tooltip
- :title="__('Latest pipeline for this branch')"
+ :title="__('Latest pipeline for the most recent commit on this branch')"
class="js-pipeline-url-latest badge badge-success"
>
{{ __('latest') }}
diff --git a/app/views/projects/pipelines/_info.html.haml b/app/views/projects/pipelines/_info.html.haml
index 9614f33fe2f..53bb3c7487d 100644
--- a/app/views/projects/pipelines/_info.html.haml
+++ b/app/views/projects/pipelines/_info.html.haml
@@ -21,7 +21,7 @@
.icon-container
= sprite_icon('flag')
- if @pipeline.latest?
- %span.js-pipeline-url-latest.badge.badge-success.has-tooltip{ title: _("Latest pipeline for this branch") }
+ %span.js-pipeline-url-latest.badge.badge-success.has-tooltip{ title: _("Latest pipeline for the most recent commit on this branch") }
latest
- if @pipeline.has_yaml_errors?
%span.js-pipeline-url-yaml.badge.badge-danger.has-tooltip{ title: @pipeline.yaml_errors }
diff --git a/changelogs/unreleased/latest-pipeline.yml b/changelogs/unreleased/latest-pipeline.yml
new file mode 100644
index 00000000000..1177bb57121
--- /dev/null
+++ b/changelogs/unreleased/latest-pipeline.yml
@@ -0,0 +1,5 @@
+---
+title: Updated latest pipeline tag tooltip to be more descriptive
+merge_request: 31624
+author:
+type: changed
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 1c1a3a51932..0568bdbdfca 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -6502,7 +6502,7 @@ msgstr ""
msgid "Latest changes"
msgstr ""
-msgid "Latest pipeline for this branch"
+msgid "Latest pipeline for the most recent commit on this branch"
msgstr ""
msgid "Lead"