summaryrefslogtreecommitdiff
path: root/.babelrc
diff options
context:
space:
mode:
authorConstance Okoghenun <cokoghenun@gitlab.com>2018-01-11 16:27:30 +0100
committerConstance Okoghenun <cokoghenun@gitlab.com>2018-01-11 16:27:30 +0100
commit0fe784cbfb56a701259d83c989341afb1b7bc124 (patch)
tree099ec5f39984c031b2403f75b1958be93e46d882 /.babelrc
parent7d0a1285a10fcb4735c20e21d83367159402a06d (diff)
parent27732df37178c3a07c99304406dfdb41fa8b3670 (diff)
downloadgitlab-ce-0fe784cbfb56a701259d83c989341afb1b7bc124.tar.gz
Resolved conflicts in dispatcher.jshelp-profiles-dispatcher-refactor
Diffstat (limited to '.babelrc')
-rw-r--r--.babelrc3
1 files changed, 2 insertions, 1 deletions
diff --git a/.babelrc b/.babelrc
index 2bae7ca9fbf..b93bef72de1 100644
--- a/.babelrc
+++ b/.babelrc
@@ -8,7 +8,8 @@
"plugins": [
["istanbul", {
"exclude": [
- "spec/javascripts/**/*"
+ "spec/javascripts/**/*",
+ "app/assets/javascripts/locale/**/app.js"
]
}],
["transform-define", {