diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2019-03-07 17:04:00 +0700 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2019-03-07 17:04:00 +0700 |
| commit | 021f787eac9eea992e159e2e46de73f373f8e5c7 (patch) | |
| tree | 1ff85f3b6296a5a9cc7d9284b7adecc1d7994a97 | |
| parent | a3e5762031f6a76eb74afc1be102a4dc3b68d996 (diff) | |
| download | gitlab-ce-job-detail-view-sidebar-for-mr-pipelines.tar.gz | |
Extend job detail view sidebar for mr pipelinesjob-detail-view-sidebar-for-mr-pipelines
| -rw-r--r-- | app/assets/javascripts/jobs/components/stages_dropdown.vue | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/app/assets/javascripts/jobs/components/stages_dropdown.vue b/app/assets/javascripts/jobs/components/stages_dropdown.vue index c5076d65ff9..72700370b0e 100644 --- a/app/assets/javascripts/jobs/components/stages_dropdown.vue +++ b/app/assets/javascripts/jobs/components/stages_dropdown.vue @@ -42,11 +42,21 @@ export default { <a :href="pipeline.path" class="js-pipeline-path link-commit qa-pipeline-path" >#{{ pipeline.id }}</a > - <template v-if="hasRef"> - {{ __('from') }} - <a :href="pipeline.ref.path" class="link-commit ref-name">{{ pipeline.ref.name }}</a> - </template> - + if pipeline.merge_request.exist? { + for + <a :href="pipeline.merge_request.path" class="blah" >{{ pipeline.merge_request.iid }}</a> + with + <a :href="pipeline.merge_request.source_branch_path" class="blah">{{ pipeline.merge_request.source_branch }}</a> + if pipeline.merge_request["flags"]["attached"] { + into + <a :href="pipeline.merge_request.target_branch_path" class="blah">{{ pipeline.merge_request.target_branch }}</a> + } + } else { + <template v-if="hasRef"> + {{ __('for') }} + <a :href="pipeline.ref.path" class="link-commit ref-name">{{ pipeline.ref.name }}</a> + </template> + } <button type="button" data-toggle="dropdown" |