From a24cb6de02a57215db9f6c582f4244c8bd190211 Mon Sep 17 00:00:00 2001 From: Nathan Friend Date: Wed, 20 Mar 2019 12:39:27 -0300 Subject: [PATCH] Update pipeline list view This commit updates the pipeline page and related components to include new pipeline information added by the post-merge pipeline feature. --- .../pipelines/components/pipeline_url.vue | 8 +- .../components/pipelines_table_row.vue | 3 +- .../vue_shared/components/commit.vue | 70 +++++++++++--- .../nfriend-update-pipeline-list-view.yml | 5 + locale/gitlab.pot | 5 +- .../user_sees_merge_request_pipelines_spec.rb | 78 +++++++-------- .../projects/pipelines/pipelines_spec.rb | 95 +++++++++++++++++++ .../environments/environment_item_spec.js | 2 +- .../pipelines/pipeline_url_spec.js | 12 ++- .../vue_shared/components/commit_spec.js | 90 +++++++++++++++++- 10 files changed, 302 insertions(+), 66 deletions(-) create mode 100644 changelogs/unreleased/nfriend-update-pipeline-list-view.yml diff --git a/app/assets/javascripts/pipelines/components/pipeline_url.vue b/app/assets/javascripts/pipelines/components/pipeline_url.vue index 918622ef8dc..3e7bf20470c 100644 --- a/app/assets/javascripts/pipelines/components/pipeline_url.vue +++ b/app/assets/javascripts/pipelines/components/pipeline_url.vue @@ -110,12 +110,12 @@ export default { {{ __('stuck') }} - {{ __('merge request') }} + {{ __('detached') }} diff --git a/app/assets/javascripts/pipelines/components/pipelines_table_row.vue b/app/assets/javascripts/pipelines/components/pipelines_table_row.vue index f6454a84ea5..1c44427e720 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_table_row.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_table_row.vue @@ -272,10 +272,11 @@ export default { :tag="commitTag" :commit-ref="commitRef" :commit-url="commitUrl" + :merge-request-ref="pipeline.merge_request" :short-sha="commitShortSha" :title="commitTitle" :author="commitAuthor" - :show-branch="!isChildView" + :show-ref-info="!isChildView" /> diff --git a/app/assets/javascripts/vue_shared/components/commit.vue b/app/assets/javascripts/vue_shared/components/commit.vue index ee685a4b8cd..3f282138bdf 100644 --- a/app/assets/javascripts/vue_shared/components/commit.vue +++ b/app/assets/javascripts/vue_shared/components/commit.vue @@ -1,5 +1,6 @@