Merge branch 'changeCIConfig'

.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

.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