diff options
author | Mike Greiling <mike@pixelcog.com> | 2019-03-28 17:38:53 +0300 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2019-03-28 17:38:53 +0300 |
commit | a74c3e6c3b418ea585f02ba15af1c7292f895a1a (patch) | |
tree | 8118c012cc848589773527a11666ac2a9b65fdbb | |
parent | 3f69bd51e8c82ff86ba46b69c557ab81048db174 (diff) | |
parent | 9072a70108fdbf5b108093d375bf385ccc03f7ea (diff) |
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
-rw-r--r-- | app/assets/javascripts/environments/components/environment_item.vue | 29 | ||||
-rw-r--r-- | changelogs/unreleased/24936-remove-type-from-review-app-name.yml | 5 |
2 files changed, 24 insertions, 10 deletions
diff --git a/app/assets/javascripts/environments/components/environment_item.vue b/app/assets/javascripts/environments/components/environment_item.vue index a092bdfbc6c..c541ea3445b 100644 --- a/app/assets/javascripts/environments/components/environment_item.vue +++ b/app/assets/javascripts/environments/components/environment_item.vue @@ -459,12 +459,7 @@ export default { class="gl-responsive-table-row" role="row" > - <div - v-gl-tooltip - :title="model.name" - class="table-section section-wrap section-15 text-truncate" - role="gridcell" - > + <div class="table-section section-wrap section-15 text-truncate" role="gridcell"> <div v-if="!model.isFolder" class="table-mobile-header" role="rowheader"> {{ s__('Environments|Environment') }} </div> @@ -473,14 +468,28 @@ export default { <icon :name="deployIconName" /> </span> - <span v-if="!model.isFolder" class="environment-name table-mobile-content"> - <a class="qa-environment-link" :href="environmentPath"> {{ model.name }} </a> + <span + 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"> {{ s__('Environments|protected') }} </span> </span> - - <span v-else class="folder-name" role="button" @click="onClickFolder"> + <span + v-else + v-gl-tooltip + :title="model.folderName" + class="folder-name" + role="button" + @click="onClickFolder" + > <icon :name="folderIconName" class="folder-icon" /> <icon name="folder" class="folder-icon" /> diff --git a/changelogs/unreleased/24936-remove-type-from-review-app-name.yml b/changelogs/unreleased/24936-remove-type-from-review-app-name.yml new file mode 100644 index 00000000000..639333264f6 --- /dev/null +++ b/changelogs/unreleased/24936-remove-type-from-review-app-name.yml @@ -0,0 +1,5 @@ +--- +title: Remove unnecessary folder prefix from environment name +merge_request: 25600 +author: +type: changed |