forked from treehouse/mastodon
Revert CircleCI and some webpack changes to match upstream
parent
d52e27f3db
commit
6b999411fc
|
@ -9,7 +9,6 @@ aliases:
|
||||||
DB_HOST: localhost
|
DB_HOST: localhost
|
||||||
DB_USER: root
|
DB_USER: root
|
||||||
RAILS_ENV: test
|
RAILS_ENV: test
|
||||||
NODE_ENV: test
|
|
||||||
PARALLEL_TEST_PROCESSORS: 4
|
PARALLEL_TEST_PROCESSORS: 4
|
||||||
ALLOW_NOPAM: true
|
ALLOW_NOPAM: true
|
||||||
CONTINUOUS_INTEGRATION: true
|
CONTINUOUS_INTEGRATION: true
|
||||||
|
@ -122,10 +121,7 @@ jobs:
|
||||||
steps:
|
steps:
|
||||||
- *attach_workspace
|
- *attach_workspace
|
||||||
- *install_system_dependencies
|
- *install_system_dependencies
|
||||||
- run:
|
- run: ./bin/rails assets:precompile
|
||||||
name: Precompile assets
|
|
||||||
command: ./bin/rails assets:precompile
|
|
||||||
no_output_timeout: 40m
|
|
||||||
- persist_to_workspace:
|
- persist_to_workspace:
|
||||||
root: ~/projects/
|
root: ~/projects/
|
||||||
paths:
|
paths:
|
||||||
|
|
|
@ -5,7 +5,4 @@ const sharedConfig = require('./shared.js');
|
||||||
|
|
||||||
module.exports = merge(sharedConfig, {
|
module.exports = merge(sharedConfig, {
|
||||||
mode: 'development',
|
mode: 'development',
|
||||||
optimization: {
|
|
||||||
minimize: false,
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue