summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2017-01-15 14:45:30 +0000
committerFatih Acet <acetfatih@gmail.com>2017-01-15 14:45:30 +0000
commitb56e57ec3b131e48030574251175afe311bcf51b (patch)
tree7b3b2988a912c7c20bd44497874e0b84aa977ef3 /app/views
parent62f8cc11531da89a0fffb92e849b838ef845c368 (diff)
parentebc1d5b39d02ddf3d5a94e968084ca67a59603e2 (diff)
downloadgitlab-ce-b56e57ec3b131e48030574251175afe311bcf51b.tar.gz
Merge branch 'pipelines_missing_pagination' into 'master'
fix pagination component handling different header styles from different server proxies See merge request !8569
Diffstat (limited to 'app/views')
-rw-r--r--app/views/projects/pipelines/index.html.haml1
1 files changed, 0 insertions, 1 deletions
diff --git a/app/views/projects/pipelines/index.html.haml b/app/views/projects/pipelines/index.html.haml
index abea6932567..df36279ed75 100644
--- a/app/views/projects/pipelines/index.html.haml
+++ b/app/views/projects/pipelines/index.html.haml
@@ -64,5 +64,4 @@
.vue-pipelines-index
-= page_specific_javascript_tag('vue_pagination/index.js')
= page_specific_javascript_tag('vue_pipelines_index/index.js')