Merge branch 'master' into fix-javascript-regexp

korny · korny · commit 5f120869773d · 2019-11-24T01:40:20.000+01:00
diff --git a/.codeclimate.yml b/.codeclimate.yml
@@ -0,0 +1,6 @@
+engines:
+  rubocop:
+    enabled: true
+    checks:
+      Rubocop/Layout/TrailingWhitespace:
+        enabled: false
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,7 @@ rvm:
   - 2.1
   - 2.2
   - 2.3
-  - 2.4.2
+  - 2.4
   - 2.5
   - 2.6
   - ruby-head
@@ -21,6 +21,7 @@ before_script:
 - if (ruby -e "exit RUBY_VERSION.to_f >= 2.3"); then export RUBYOPT="--enable-frozen-string-literal"; fi; echo $RUBYOPT
 matrix:
   allow_failures:
+    - rvm: 1.8.7
     - rvm: ruby-head
     - rvm: jruby
 script: "rake test" # test:scanners"
