diff options
author | Mike Greiling <mike@pixelcog.com> | 2018-08-03 20:25:56 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2018-08-03 20:25:56 +0000 |
commit | 03c4c46766ca6b1c084226e66651b62308c1d56f (patch) | |
tree | 0ac8d60daab83ff13bc392e8c76d900aa64e3e7c /app/assets/javascripts/environments/components/environments_table.vue | |
parent | d40c5fa0ff4b7fa84846d8f1e15d48bf5b1f2cc2 (diff) | |
download | gitlab-ce-03c4c46766ca6b1c084226e66651b62308c1d56f.tar.gz |
Port of protected environments frontend changes from EE to CE
Diffstat (limited to 'app/assets/javascripts/environments/components/environments_table.vue')
-rw-r--r-- | app/assets/javascripts/environments/components/environments_table.vue | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/app/assets/javascripts/environments/components/environments_table.vue b/app/assets/javascripts/environments/components/environments_table.vue index 22863e926d4..016e9f7c7b3 100644 --- a/app/assets/javascripts/environments/components/environments_table.vue +++ b/app/assets/javascripts/environments/components/environments_table.vue @@ -15,7 +15,7 @@ export default { environments: { type: Array, required: true, - default: () => ([]), + default: () => [], }, canReadEnvironment: { @@ -35,10 +35,7 @@ export default { return `${window.location.pathname}/folders/${model.folderName}`; }, shouldRenderFolderContent(env) { - return env.isFolder && - env.isOpen && - env.children && - env.children.length > 0; + return env.isFolder && env.isOpen && env.children && env.children.length > 0; }, }, }; @@ -53,7 +50,7 @@ export default { role="row" > <div - class="table-section section-10 environments-name" + class="table-section section-15 environments-name" role="columnheader" > {{ s__("Environments|Environment") }} @@ -71,7 +68,7 @@ export default { {{ s__("Environments|Job") }} </div> <div - class="table-section section-25 environments-commit" + class="table-section section-20 environments-commit" role="columnheader" > {{ s__("Environments|Commit") }} @@ -91,7 +88,7 @@ export default { :model="model" :can-create-deployment="canCreateDeployment" :can-read-environment="canReadEnvironment" - :key="i" + :key="`environment-item-${i}`" /> <template |