From fd10ff30bbd4b24889fc0c79fbe35af95f9b5666 Mon Sep 17 00:00:00 2001 From: Regis Date: Sun, 6 Nov 2016 11:27:27 -0700 Subject: [PATCH] extract pagination into own folder and precompile in application.rb --- .../gl_pagination.js.es6 => vue_pagination/index.js.es6} | 0 app/assets/javascripts/vue_pipelines_index/index.js.es6 | 1 - app/views/projects/pipelines/index.html.haml | 3 +++ config/application.rb | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) rename app/assets/javascripts/{vue_pipelines_index/gl_pagination.js.es6 => vue_pagination/index.js.es6} (100%) diff --git a/app/assets/javascripts/vue_pipelines_index/gl_pagination.js.es6 b/app/assets/javascripts/vue_pagination/index.js.es6 similarity index 100% rename from app/assets/javascripts/vue_pipelines_index/gl_pagination.js.es6 rename to app/assets/javascripts/vue_pagination/index.js.es6 diff --git a/app/assets/javascripts/vue_pipelines_index/index.js.es6 b/app/assets/javascripts/vue_pipelines_index/index.js.es6 index 0ba043ef612..f7657879ac4 100644 --- a/app/assets/javascripts/vue_pipelines_index/index.js.es6 +++ b/app/assets/javascripts/vue_pipelines_index/index.js.es6 @@ -5,7 +5,6 @@ //= require ./store.js.es6 //= require ./pipeline_url.js.es6 -//= require ./gl_pagination.js.es6 //= require ./pipeline_head.js.es6 //= require ./stages.js.es6 //= require ./pipeline_actions.js.es6 diff --git a/app/views/projects/pipelines/index.html.haml b/app/views/projects/pipelines/index.html.haml index a09f23b2fde..6f70b239826 100644 --- a/app/views/projects/pipelines/index.html.haml +++ b/app/views/projects/pipelines/index.html.haml @@ -58,5 +58,8 @@ .vue-pipelines-index = page_specific_javascript_tag('vue_icons/index.js') +-# ^^ this component loads Vue so the rest don't +-# this will no longer be an issue once Vue2 is global += page_specific_javascript_tag('vue_pagination/index.js') = page_specific_javascript_tag('vue_pipelines_status/index.js') = page_specific_javascript_tag('vue_pipelines_index/index.js') diff --git a/config/application.rb b/config/application.rb index 74e00325cf2..4fde984ef62 100644 --- a/config/application.rb +++ b/config/application.rb @@ -101,6 +101,7 @@ module Gitlab config.assets.precompile << "u2f.js" config.assets.precompile << "vue_pipelines_index/index.js" config.assets.precompile << "vue_pipelines_status/index.js" + config.assets.precompile << "vue_pagination/index.js" config.assets.precompile << "vue_icons/index.js" # Version of your assets, change this if you want to expire all your assets