summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRegis <boudinot.regis@yahoo.com>2017-01-15 00:11:12 -0500
committerRegis <boudinot.regis@yahoo.com>2017-01-15 00:11:12 -0500
commitebc1d5b39d02ddf3d5a94e968084ca67a59603e2 (patch)
tree8cce7d1f180b3a87dbf8b6f898135e45ff0e2c54
parentc5a373c634a0547a204c35fec8fd2c4fe4acbca8 (diff)
downloadgitlab-ce-ebc1d5b39d02ddf3d5a94e968084ca67a59603e2.tar.gz
change how pagination component is loadedpipelines_missing_pagination
-rw-r--r--app/assets/javascripts/vue_pipelines_index/index.js.es61
-rw-r--r--app/views/projects/pipelines/index.html.haml1
-rw-r--r--config/application.rb1
3 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_pipelines_index/index.js.es6 b/app/assets/javascripts/vue_pipelines_index/index.js.es6
index 9dfbedd73ab..edd01f17a97 100644
--- a/app/assets/javascripts/vue_pipelines_index/index.js.es6
+++ b/app/assets/javascripts/vue_pipelines_index/index.js.es6
@@ -1,5 +1,6 @@
/* global Vue, VueResource, gl */
/*= require vue_common_component/commit */
+/*= require vue_pagination/index */
/*= require vue-resource
/*= require boards/vue_resource_interceptor */
/*= require ./status.js.es6 */
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')
diff --git a/config/application.rb b/config/application.rb
index aa52b0cd512..8ce549cebf6 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -111,7 +111,6 @@ module Gitlab
config.assets.precompile << "lib/*.js"
config.assets.precompile << "u2f.js"
config.assets.precompile << "vue_pipelines_index/index.js"
- config.assets.precompile << "vue_pagination/index.js"
config.assets.precompile << "vendor/assets/fonts/*"
# Version of your assets, change this if you want to expire all your assets