diff options
| author | pluralcafe-docker <git@plural.cafe> | 2018-10-01 05:42:11 +0000 |
|---|---|---|
| committer | pluralcafe-docker <git@plural.cafe> | 2018-10-01 05:42:11 +0000 |
| commit | f9275cb762a311cbf298b3929552a153703c0726 (patch) | |
| tree | 35797a6c1ae1c51d5e42ffe8b63eecbfb4336f56 /config/webpack/configuration.js | |
| parent | 2aedb7e83cf7a2c1a7de69d2bc20808f20c10f8f (diff) | |
| parent | 4e60a0d5433f5dfa4f71a452cc5c6ceb0f21ceab (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'config/webpack/configuration.js')
| -rw-r--r-- | config/webpack/configuration.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/webpack/configuration.js b/config/webpack/configuration.js index 4d0d28582..f81d23dd4 100644 --- a/config/webpack/configuration.js +++ b/config/webpack/configuration.js @@ -8,7 +8,7 @@ const glob = require('glob'); const configPath = resolve('config', 'webpacker.yml'); const loadersDir = join(__dirname, 'loaders'); -const settings = safeLoad(readFileSync(configPath), 'utf8')[env.NODE_ENV]; +const settings = safeLoad(readFileSync(configPath), 'utf8')[env.RAILS_ENV || env.NODE_ENV]; const flavourFiles = glob.sync('app/javascript/flavours/*/theme.yml'); const skinFiles = glob.sync('app/javascript/skins/*/*'); const flavours = {}; |