Merge branch '24936-remove-type-from-review-app-name' into 'master'
Remove redundant group name from environment name on the "Environments" page Closes #24936 See merge request gitlab-org/gitlab-ce!25600
This commit is contained in:
commit
a74c3e6c3b
|
@ -459,12 +459,7 @@ export default {
|
||||||
class="gl-responsive-table-row"
|
class="gl-responsive-table-row"
|
||||||
role="row"
|
role="row"
|
||||||
>
|
>
|
||||||
<div
|
<div class="table-section section-wrap section-15 text-truncate" role="gridcell">
|
||||||
v-gl-tooltip
|
|
||||||
:title="model.name"
|
|
||||||
class="table-section section-wrap section-15 text-truncate"
|
|
||||||
role="gridcell"
|
|
||||||
>
|
|
||||||
<div v-if="!model.isFolder" class="table-mobile-header" role="rowheader">
|
<div v-if="!model.isFolder" class="table-mobile-header" role="rowheader">
|
||||||
{{ s__('Environments|Environment') }}
|
{{ s__('Environments|Environment') }}
|
||||||
</div>
|
</div>
|
||||||
|
@ -473,14 +468,28 @@ export default {
|
||||||
<icon :name="deployIconName" />
|
<icon :name="deployIconName" />
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
<span v-if="!model.isFolder" class="environment-name table-mobile-content">
|
<span
|
||||||
<a class="qa-environment-link" :href="environmentPath"> {{ model.name }} </a>
|
v-if="!model.isFolder"
|
||||||
|
v-gl-tooltip
|
||||||
|
:title="model.name"
|
||||||
|
class="environment-name table-mobile-content"
|
||||||
|
>
|
||||||
|
<a class="qa-environment-link" :href="environmentPath">
|
||||||
|
<span v-if="model.size === 1">{{ model.name }}</span>
|
||||||
|
<span v-else>{{ model.name_without_type }}</span>
|
||||||
|
</a>
|
||||||
<span v-if="isProtected" class="badge badge-success">
|
<span v-if="isProtected" class="badge badge-success">
|
||||||
{{ s__('Environments|protected') }}
|
{{ s__('Environments|protected') }}
|
||||||
</span>
|
</span>
|
||||||
</span>
|
</span>
|
||||||
|
<span
|
||||||
<span v-else class="folder-name" role="button" @click="onClickFolder">
|
v-else
|
||||||
|
v-gl-tooltip
|
||||||
|
:title="model.folderName"
|
||||||
|
class="folder-name"
|
||||||
|
role="button"
|
||||||
|
@click="onClickFolder"
|
||||||
|
>
|
||||||
<icon :name="folderIconName" class="folder-icon" />
|
<icon :name="folderIconName" class="folder-icon" />
|
||||||
|
|
||||||
<icon name="folder" class="folder-icon" />
|
<icon name="folder" class="folder-icon" />
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Remove unnecessary folder prefix from environment name
|
||||||
|
merge_request: 25600
|
||||||
|
author:
|
||||||
|
type: changed
|
Loading…
Reference in New Issue