more post-merge fixes

app/assets/javascripts/application.js

@@ -54,8 +54,8 @@ requireAll(require.context('./commit',     false, /^\.\/.*\.(js|es6)$/));
 requireAll(require.context('./extensions', false, /^\.\/.*\.(js|es6)$/));
 requireAll(require.context('./lib/utils',  false, /^\.\/.*\.(js|es6)$/));
 requireAll(require.context('./u2f',        false, /^\.\/.*\.(js|es6)$/));
-requireAll(require.context('.',            false, /^\.\/(?!application).*\.(js|es6)$/));
 requireAll(require.context('./droplab',    false, /^\.\/.*\.(js|es6)$/));
+requireAll(require.context('.',            false, /^\.\/(?!application).*\.(js|es6)$/));
 require('vendor/fuzzaldrin-plus');
 window.ES6Promise = require('vendor/es6-promise.auto');
 window.ES6Promise.polyfill();

app/assets/javascripts/vue_pipelines_index/index.js.es6

 /* global Vue, VueResource, gl */
 window.Vue = require('vue');
 window.Vue.use(require('vue-resource'));
-require('../vue_common_component/commit')
+require('../vue_common_component/commit');
 require('../boards/vue_resource_interceptor');
 require('./status');
 require('./store');

config/webpack.config.js

@@ -35,7 +35,7 @@ var config = {
     lib_chart:            './lib/chart.js',
     lib_d3:               './lib/d3.js',
     vue_pagination:       './vue_pagination/index.js',
-    vue_pipelines:  './vue_pipelines_index/index.js',
+    vue_pipelines:        './vue_pipelines_index/index.js',
   },
   output: {

spec/javascripts/filtered_search/dropdown_utils_spec.js.es6

-//= require extensions/array
-//= require filtered_search/dropdown_utils
-//= require filtered_search/filtered_search_tokenizer
-//= require filtered_search/filtered_search_dropdown_manager
+require('~/extensions/array');
+require('~/filtered_search/dropdown_utils');
+require('~/filtered_search/filtered_search_tokenizer');
+require('~/filtered_search/filtered_search_dropdown_manager');
 (() => {
   describe('Dropdown Utils', () => {

spec/javascripts/filtered_search/filtered_search_dropdown_manager_spec.js.es6

-//= require extensions/array
-//= require filtered_search/filtered_search_tokenizer
-//= require filtered_search/filtered_search_dropdown_manager
+require('~/extensions/array');
+require('~/filtered_search/filtered_search_tokenizer');
+require('~/filtered_search/filtered_search_dropdown_manager');
 (() => {
   describe('Filtered Search Dropdown Manager', () => {

spec/javascripts/filtered_search/filtered_search_token_keys_spec.js.es6

-//= require extensions/array
-//= require filtered_search/filtered_search_token_keys
+require('~/extensions/array');
+require('~/filtered_search/filtered_search_token_keys');
 (() => {
   describe('Filtered Search Token Keys', () => {

spec/javascripts/filtered_search/filtered_search_tokenizer_spec.js.es6

-//= require extensions/array
-//= require filtered_search/filtered_search_token_keys
-//= require filtered_search/filtered_search_tokenizer
+require('~/extensions/array');
+require('~/filtered_search/filtered_search_token_keys');
+require('~/filtered_search/filtered_search_tokenizer');
 (() => {
   describe('Filtered Search Tokenizer', () => {

spec/javascripts/lib/utils/text_utility_spec.js.es6

-//= require lib/utils/text_utility
+require('~/lib/utils/text_utility');
 (() => {
   describe('text_utility', () => {

spec/javascripts/vue_pagination/pagination_spec.js.es6

-//= require vue
-//= require lib/utils/common_utils
-//= require vue_pagination/index
-/* global fixture, gl */
+require('~/lib/utils/common_utils');
+require('~/vue_pagination/index');
 describe('Pagination component', () => {
   let component;
@@ -17,7 +15,7 @@ describe('Pagination component', () => {
   };
   it('should render and start at page 1', () => {
-    fixture.set('<div class="test-pagination-container"></div>');
+    setFixtures('<div class="test-pagination-container"></div>');
     component = new window.gl.VueGlPagination({
       el: document.querySelector('.test-pagination-container'),
@@ -40,7 +38,7 @@ describe('Pagination component', () => {
   });
   it('should go to the previous page', () => {
-    fixture.set('<div class="test-pagination-container"></div>');
+    setFixtures('<div class="test-pagination-container"></div>');
     component = new window.gl.VueGlPagination({
       el: document.querySelector('.test-pagination-container'),
@@ -61,7 +59,7 @@ describe('Pagination component', () => {
   });
   it('should go to the next page', () => {
-    fixture.set('<div class="test-pagination-container"></div>');
+    setFixtures('<div class="test-pagination-container"></div>');
     component = new window.gl.VueGlPagination({
       el: document.querySelector('.test-pagination-container'),
@@ -82,7 +80,7 @@ describe('Pagination component', () => {
   });
   it('should go to the last page', () => {
-    fixture.set('<div class="test-pagination-container"></div>');
+    setFixtures('<div class="test-pagination-container"></div>');
     component = new window.gl.VueGlPagination({
       el: document.querySelector('.test-pagination-container'),
@@ -103,7 +101,7 @@ describe('Pagination component', () => {
   });
   it('should go to the first page', () => {
-    fixture.set('<div class="test-pagination-container"></div>');
+    setFixtures('<div class="test-pagination-container"></div>');
     component = new window.gl.VueGlPagination({
       el: document.querySelector('.test-pagination-container'),
@@ -124,7 +122,7 @@ describe('Pagination component', () => {
   });
   it('should do nothing', () => {
-    fixture.set('<div class="test-pagination-container"></div>');
+    setFixtures('<div class="test-pagination-container"></div>');
     component = new window.gl.VueGlPagination({
       el: document.querySelector('.test-pagination-container'),