Merge branch 'master' into dependabot/bundler/rubocop-0.74.0

digitaltom · Aug 9, 2019 · 2a4acf4 · 2a4acf4
2 parents 09c2eba + 891c9ed
commit 2a4acf4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,9 @@ rvm:
 sudo: required
 addons:
   chrome: stable
+before_install:
+ - # start your web application and listen on `localhost`
+ - google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost &
 script:
  - 'bundle exec rspec'
  - 'bundle exec rubocop -S'

diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 [![Build Status](https://travis-ci.org/digitaltom/photobooth.png?branch=master)](https://travis-ci.org/digitaltom/photobooth)
 [![Code Climate](https://codeclimate.com/github/digitaltom/photobooth.png)](https://codeclimate.com/github/digitaltom/photobooth)
 [![Coverage Status](https://coveralls.io/repos/github/digitaltom/photobooth/badge.svg?branch=master&)](https://coveralls.io/github/digitaltom/photobooth?branch=master)
+[![Dependencies](https://badgen.net/dependabot/digitaltom/photobooth/?icon=dependabot)](https://badgen.net/dependabot/digitaltom/photobooth/?icon=dependabot)
 
 # Photobooth