diff --git a/.gitignore b/.gitignore index a3d9cdb06a0..3b5b4c59af3 100644 --- a/.gitignore +++ b/.gitignore @@ -34,7 +34,6 @@ projectFilesBackup /core/client/tpl/hbs-tpl.js /core/client/assets/css /core/client/assets/fonts -.sass-cache/ /core/client/assets/vendor /core/server/data/export/exported* /docs diff --git a/.npmignore b/.npmignore index 5883c10ffb6..cb0c320f71b 100644 --- a/.npmignore +++ b/.npmignore @@ -23,6 +23,5 @@ config.js CONTRIBUTING.md SECURITY.md .travis.yml -Gemfile* *.html bower_components/** \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 39be9700d7b..b582beffe3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,6 @@ matrix: allow_failures: - env: DB=pg before_install: - - gem install bundler - git clone git://github.com/n1k0/casperjs.git ~/casperjs - cd ~/casperjs - git checkout tags/1.1-beta3