Merge pull request #46 from gnosis/development

WA-234 & WA-438 Removing owners & Daily Limit updates
5afe · Jun 26, 2018 · 9898a1b · 9898a1b
2 parents 90920b6 + b2a20f2
commit 9898a1b
Show file tree

Hide file tree

Showing 118 changed files with 22,311 additions and 42,729 deletions.
diff --git a/.babelrc b/.babelrc
@@ -8,7 +8,7 @@
         "forceAllTransforms": true
       }
     ],
-    "@babel/stage-0"
+    ["@babel/preset-stage-0", { "decoratorsLegacy": true }]
   ],
   "plugins": [
     "@babel/plugin-syntax-dynamic-import",

diff --git a/.travis.yml b/.travis.yml
@@ -17,4 +17,4 @@ after_success:
   - yarn build
   - cd build_webpack/ && cp index.html 200.html && cd ..
   - chmod ugo+x ./config/deploy/deploy.sh
-  - ./config/deploy/deploy.sh
+  - ./config/deploy/deploy.sh
diff --git a/config/jest/jest.setup.js b/config/jest/jest.setup.js
@@ -1,2 +1,2 @@
 // @flow
-jest.setTimeout(45000)
+jest.setTimeout(60000)
diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js
@@ -192,7 +192,7 @@ module.exports = {
     new webpack.DefinePlugin(env),
     // Note: this won't work without ExtractTextPlugin.extract(..) in `loaders`.
     new ExtractTextPlugin({
-      filename: 'static/css/[name].[contenthash:8].css',
+      filename: 'static/css/[name].[hash:8].css',
       allChunks: true
     }),
     // Generate a manifest file which contains a mapping of all asset filenames