summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2017-05-22 18:20:15 -0500
committerAlfredo Sumaran <alfredo@gitlab.com>2017-05-22 18:20:15 -0500
commit1f0a785db8da867a1a4070e96f7807be92bff262 (patch)
tree32b1be37a8720f53f42a2856f47522ca757a0df5 /app/assets
parenta5a7b574df131897e87404c8ef5059821984f81f (diff)
downloadgitlab-ce-1f0a785db8da867a1a4070e96f7807be92bff262.tar.gz
Add basic tests for groups component
[ci skip]
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/groups/components/group_folder.vue2
-rw-r--r--app/assets/javascripts/groups/components/groups.vue2
-rw-r--r--app/assets/javascripts/pipelines/pipelines.js2
3 files changed, 2 insertions, 4 deletions
diff --git a/app/assets/javascripts/groups/components/group_folder.vue b/app/assets/javascripts/groups/components/group_folder.vue
index d58a16ba859..57220e51a04 100644
--- a/app/assets/javascripts/groups/components/group_folder.vue
+++ b/app/assets/javascripts/groups/components/group_folder.vue
@@ -16,6 +16,6 @@ export default {
<template>
<ul class="content-list group-list-tree" v-show="hasGroups">
- <group-item v-for="group in groups" :group="group" />
+ <group-item v-for="(group, index) in groups" :key="index" :group="group" />
</ul>
</template>
diff --git a/app/assets/javascripts/groups/components/groups.vue b/app/assets/javascripts/groups/components/groups.vue
index 78e97e416c8..685392e16a9 100644
--- a/app/assets/javascripts/groups/components/groups.vue
+++ b/app/assets/javascripts/groups/components/groups.vue
@@ -27,7 +27,7 @@ export default {
</script>
<template>
- <div>
+ <div class="groups-list-tree-container">
<group-folder :groups="groups" />
<gl-pagination
:change="change"
diff --git a/app/assets/javascripts/pipelines/pipelines.js b/app/assets/javascripts/pipelines/pipelines.js
index 934bd7deb31..9275b3efeb1 100644
--- a/app/assets/javascripts/pipelines/pipelines.js
+++ b/app/assets/javascripts/pipelines/pipelines.js
@@ -277,9 +277,7 @@ export default {
<gl-pagination
v-if="shouldRenderPagination"
- :pagenum="pagenum"
:change="change"
- :count="state.count.all"
:pageInfo="state.pageInfo"/>
</div>
</div>