summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-05-26 13:36:38 +0000
committerDouwe Maan <douwe@gitlab.com>2017-05-26 13:36:38 +0000
commitbdc91dfb2df46599f2995094446982447ea931eb (patch)
treebb1aa654dd60e680d22c9866dc10b1f819770dd7 /config
parent8f2af757d3a040dbd81e30e49cb2d575848961b8 (diff)
parent83060667b057e73122227257d2958d77b10e3562 (diff)
downloadgitlab-ce-bdc91dfb2df46599f2995094446982447ea931eb.tar.gz
Merge branch 'locale-region-fix' into 'master'
Fixed locale frontend not picking up regions Closes #32913 See merge request !11717
Diffstat (limited to 'config')
-rw-r--r--config/webpack.config.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 2ada74e5a55..ce140b75382 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -102,7 +102,7 @@ var config = {
loader: 'file-loader',
},
{
- test: /locale\/[a-z]+\/(.*)\.js$/,
+ test: /locale\/\w+\/(.*)\.js$/,
loader: 'exports-loader?locales',
},
]