diff options
| author | Nathan Friend <nfriend@gitlab.com> | 2019-02-27 12:55:36 -0400 |
|---|---|---|
| committer | Nathan Friend <nfriend@gitlab.com> | 2019-03-18 10:20:28 -0300 |
| commit | 9072a70108fdbf5b108093d375bf385ccc03f7ea (patch) | |
| tree | a7f94333abe64dd715e86127e2beded340de8e7a /app | |
| parent | bbbaa7078b62621f86030502bb1b317edea93039 (diff) | |
| download | gitlab-ce-9072a70108fdbf5b108093d375bf385ccc03f7ea.tar.gz | |
Remove folder from environment name
Before this commit, environments grouped together in a "folder" would
include the folder name in the UI. This information was unnecessary
since the folder is also shown in the UI.
In addition, this commit also makes some minor changes to how tooltips
are displayed for both environments and folders.
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/environments/components/environment_item.vue | 29 |
1 files changed, 19 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" /> |