diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2019-11-24 01:40:20 +0100 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2019-11-24 01:40:20 +0100 |
| commit | 5f120869773dd3b91335da1bfdc956916becf657 (patch) | |
| tree | 125161729f9aa962c05dde131c1c720da982db53 | |
| parent | c7e3b31f405b3669d823bda2f0f0ec3df64fdf2d (diff) | |
| parent | f79710241c5bd19324418efcf24ecbf6d853a23c (diff) | |
| download | coderay-5f120869773dd3b91335da1bfdc956916becf657.tar.gz | |
Merge branch 'master' into fix-javascript-regexp
| -rw-r--r-- | .codeclimate.yml | 6 | ||||
| -rw-r--r-- | .travis.yml | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/.codeclimate.yml b/.codeclimate.yml new file mode 100644 index 0000000..f6a420d --- /dev/null +++ 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 index c1fa23a..8191789 100644 --- 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" |