summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-01-15 10:47:53 -0500
committerMike Greiling <mike@pixelcog.com>2017-01-15 10:47:53 -0500
commit76a4f1e61d7b29ba09fa3e8b5a0c39cd8889b2c4 (patch)
treec15e21528be154a12755b77ea0e4f34ff37bc077 /config
parentc9dbd5f5130ea45ba83b0047bec47d222629c782 (diff)
parentb56e57ec3b131e48030574251175afe311bcf51b (diff)
downloadgitlab-ce-76a4f1e61d7b29ba09fa3e8b5a0c39cd8889b2c4.tar.gz
Merge branch 'master' into go-go-gadget-webpack
* master: (24 commits) Allow to use + symbol in filenames Use string for class_name option for lazy autoload class change how pagination component is loaded revise sortable_name test formatting fix pagination component handling different header styles from different server proxies Improve disabled state select Fix Rubocop offense in build specs Add Changelog for commit links fix on pipelines page Remove empty build spec file from invalid location Merge build specs into file that has valid location Fixed spacing of labels in issuable row on milestone#show Update commit entity to point to valid commit page Allow to use ENV variables in redis config Check for env[Grape::Env::GRAPE_ROUTING_ARGS] instead of endpoint.route Mutate the attribute instead of issuing a write operation to the DB Remove useless permission checks in Gitlab::Checks::ChangeAccess Fix broken link in docs prefer unit test on model over view test rename sort method add CHANGELOG.md entry for !8277 ...
Diffstat (limited to 'config')
-rw-r--r--config/webpack.config.js1
1 files changed, 0 insertions, 1 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 0b40e2c6190..98b87462a94 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -34,7 +34,6 @@ var config = {
users: './users/users_bundle.js',
lib_chart: './lib/chart.js',
lib_d3: './lib/d3.js',
- vue_pagination: './vue_pagination/index.js',
vue_pipelines: './vue_pipelines_index/index.js',
},