diff options
Diffstat (limited to 'app/assets/javascripts/ide/components/ide_status_bar.vue')
-rw-r--r-- | app/assets/javascripts/ide/components/ide_status_bar.vue | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/assets/javascripts/ide/components/ide_status_bar.vue b/app/assets/javascripts/ide/components/ide_status_bar.vue index 6eaf08e8033..4da417a37ce 100644 --- a/app/assets/javascripts/ide/components/ide_status_bar.vue +++ b/app/assets/javascripts/ide/components/ide_status_bar.vue @@ -2,6 +2,7 @@ /* eslint-disable @gitlab/vue-i18n/no-bare-strings */ import { mapActions, mapState, mapGetters } from 'vuex'; import IdeStatusList from 'ee_else_ce/ide/components/ide_status_list.vue'; +import IdeStatusMr from './ide_status_mr.vue'; import icon from '~/vue_shared/components/icon.vue'; import tooltip from '~/vue_shared/directives/tooltip'; import timeAgoMixin from '~/vue_shared/mixins/timeago'; @@ -15,6 +16,7 @@ export default { userAvatarImage, CiIcon, IdeStatusList, + IdeStatusMr, }, directives: { tooltip, @@ -27,7 +29,7 @@ export default { }, computed: { ...mapState(['currentBranchId', 'currentProjectId']), - ...mapGetters(['currentProject', 'lastCommit']), + ...mapGetters(['currentProject', 'lastCommit', 'currentMergeRequest']), ...mapState('pipelines', ['latestPipeline']), }, watch: { @@ -121,6 +123,12 @@ export default { >{{ lastCommitFormattedAge }}</time > </div> + <ide-status-mr + v-if="currentMergeRequest" + class="mx-3" + :url="currentMergeRequest.web_url" + :text="currentMergeRequest.references.short" + /> <ide-status-list class="ml-auto" /> </footer> </template> |