diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-10 03:15:43 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-10 03:15:43 +0300 |
commit | dd28adcbf0a6eea094968826799a24bbaac12262 (patch) | |
tree | 888829c0baea614dcf50d31d9887ee9e35836012 /app/assets/javascripts/environments | |
parent | 2744f5f9d735d892fad519329ba61544455e5279 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/environments')
-rw-r--r-- | app/assets/javascripts/environments/components/deployment.vue | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/app/assets/javascripts/environments/components/deployment.vue b/app/assets/javascripts/environments/components/deployment.vue index 5352805ed6a..8c5040035d4 100644 --- a/app/assets/javascripts/environments/components/deployment.vue +++ b/app/assets/javascripts/environments/components/deployment.vue @@ -80,6 +80,15 @@ export default { userPath() { return this.user?.path; }, + deployable() { + return this.deployment?.deployable; + }, + jobName() { + return truncate(this.deployable?.name ?? '', 25); + }, + jobPath() { + return this.deployable?.buildPath; + }, }, methods: { toggleCollapse() { @@ -94,6 +103,8 @@ export default { showDetails: __('Show details'), hideDetails: __('Hide details'), triggerer: s__('Deployment|Triggerer'), + job: __('Job'), + api: __('API'), }, headerClasses: [ 'gl-display-flex', @@ -174,6 +185,20 @@ export default { <span class="gl-text-gray-500 gl-font-weight-bold">{{ $options.i18n.triggerer }}</span> <gl-link :href="userPath" class="gl-font-monospace gl-mt-3"> @{{ username }} </gl-link> </div> + <div class="gl-display-flex gl-flex-direction-column gl-ml-5"> + <span class="gl-text-gray-500 gl-font-weight-bold" :class="{ 'gl-ml-3': !deployable }"> + {{ $options.i18n.job }} + </span> + <gl-link v-if="jobPath" :href="jobPath" class="gl-font-monospace gl-mt-3"> + {{ jobName }} + </gl-link> + <span v-else-if="jobName" class="gl-font-monospace gl-mt-3"> + {{ jobName }} + </span> + <gl-badge v-else class="gl-font-monospace gl-mt-3" variant="info"> + {{ $options.i18n.api }} + </gl-badge> + </div> </div> </gl-collapse> </div> |