From a18aa0a0d1901f98e1cef35e47c9668dffd91760 Mon Sep 17 00:00:00 2001
From: brantje <brantje@gmail.com>
Date: Sun, 9 Oct 2016 18:14:27 +0200
Subject: [PATCH] Change travis config, add scrutinizer config

---
 .scrutinizer.yml | 13 +++++++++++++
 .travis.yml      | 18 ++++++------------
 2 files changed, 19 insertions(+), 12 deletions(-)
 create mode 100644 .scrutinizer.yml

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
new file mode 100644
index 00000000..44a5899a
--- /dev/null
+++ b/.scrutinizer.yml
@@ -0,0 +1,13 @@
+filter:
+    excluded_paths:
+        - 'js/vendor*'
+        - 'l10n/*'
+        - 'tests/*'
+
+imports:
+    - javascript
+    - php
+
+tools:
+    external_code_coverage:
+        timeout: 7200 # Timeout in seconds: 2 hours
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 6bd5ebe7..dc0657e9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,18 +8,12 @@ env:
         - APP_NAME=passman
     matrix:
         - DB=mysql
-#matrix:
-#    allow_failures:
-#        - env: DB=pgsql CORE_BRANCH=master
-#    include:
-#        - php: 5.6
-#          env: DB=sqlite
-#        - php: 5.6
-#          env: DB=mysql
-#        - php: 5.6
-#          env: DB=pgsql CORE_BRANCH=master
-#    fast_finish: true
-#
+
+branches:
+  only:
+    - master
+
+
 before_install:
     # enable a display for running JavaScript tests
     - export DISPLAY=:99.0