diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-01-25 10:09:06 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-01-25 10:09:06 +0000 |
commit | 4de9710ae7331e9599005cb67151ccef4f06643d (patch) | |
tree | 09206e2cbefe9b730679baeebd9b448ce0046b5f /app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.vue | |
parent | 8f6f421643c02cbc4620269f15f51942b389d9cd (diff) | |
parent | dcb79741a170eaf673237bb2becbf6fb742a8bfd (diff) | |
download | gitlab-ce-4de9710ae7331e9599005cb67151ccef4f06643d.tar.gz |
Merge branch 'master' into fl-more-mr-widget
* master: (30 commits)
Resolve "Link to Clusters in Auto DevOps instead of Kubernetes service"
Update CHANGELOG.md for 10.4.1
Add a gRPC health check to ensure Gitaly is up
Add formatted_data attribute to Git::WikiPage
Avoid array indices to fixtures in JS specs
Migrate .batch_lfs_pointers to Gitaly
Updates `Revert this merge request` text
Work around a bug in DatabaseCleaner when using the deletion strategy on MySQL
Use the DatabaseCleaner 'deletion' strategy instead of 'truncation'
Workaround a recaptcha pop-up that cannot be tested
Moves more mr widget components into vue files Adds i18n Adds better test coverage
Execute system hooks after-commit when executing project hooks
Remove one Spinach job and add one RSpec job
Migrate repository bundling to Gitaly
Use limit for search count queries
Fix offense in runners settings QA page object class
Wait for runner until it registers itself in QA tests
Fix static-analysis offenses in QA support class
Add specific views / selectors for QA runners page
Add views / selectors for pipeline show page object
...
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.vue')
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.vue | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.vue new file mode 100644 index 00000000000..8c0ce43c76c --- /dev/null +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.vue @@ -0,0 +1,48 @@ +<script> + import mrWidgetAuthorTime from '../../components/mr_widget_author_time'; + import statusIcon from '../mr_widget_status_icon'; + + export default { + name: 'MRWidgetClosed', + components: { + mrWidgetAuthorTime, + statusIcon, + }, + props: { + /* TODO: This is providing all store and service down when it + only needs metrics and targetBranch */ + mr: { + type: Object, + required: true, + default: () => ({}), + }, + }, + }; +</script> +<template> + <div class="mr-widget-body media"> + <status-icon + status="warning" + /> + <div class="media-body"> + <mr-widget-author-time + :action-text="s__('mrWidget|Closed by')" + :author="mr.metrics.closedBy" + :date-title="mr.metrics.closedAt" + :date-readable="mr.metrics.readableClosedAt" + /> + + <section class="mr-info-list"> + <p> + {{ s__("mrWidget|The changes were not merged into") }} + <a + :href="mr.targetBranchPath" + class="label-branch" + > + {{ mr.targetBranch }} + </a> + </p> + </section> + </div> + </div> +</template> |