Merge branch 'seerat/style-modals' of https://github.com/ubclaunchpad…

…/bumper into seerat/style-modals
ubclaunchpad · Jun 19, 2018 · 70ad1e4 · 70ad1e4
2 parents 3dba68b + f815c0d
commit 70ad1e4
Show file tree

Hide file tree

Showing 3 changed files with 2,148 additions and 2,053 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,7 +14,7 @@ cache:
 
 before_install:
   - cd $TRAVIS_BUILD_DIR/client
-  - npm install eslint --silent
+  - npm install
   - go get -u github.com/mattn/goveralls
   - curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
   - cd $TRAVIS_BUILD_DIR/server

diff --git a/client/.eslintrc.json b/client/.eslintrc.json
@@ -7,7 +7,6 @@
     },
     "rules": {
         "react/jsx-filename-extension": 0,
-        "import/extensions": 0,
         "react/prop-types": 0,
         "react/prefer-stateless-function": 0,
         "no-use-before-define": 0,