Merge branch 'feature/2.4.0' into develop

CanCanCommunity · Sep 16, 2018 · ab84a35 · ab84a35
2 parents c2d46a0 + 721d7a1
commit ab84a35
Show file tree

Hide file tree

Showing 20 changed files with 1,196 additions and 634 deletions.
diff --git a/.codeclimate.yml b/.codeclimate.yml
@@ -0,0 +1,5 @@
+version: "2"
+checks:
+ argument-count:
+ config:
+ threshold: 5
diff --git a/.travis.yml b/.travis.yml
@@ -2,10 +2,10 @@ language: ruby
 cache: bundler
 sudo: false
 rvm:
- - 2.2.8
  - 2.3.5
  - 2.4.2
  - 2.5.0
+ - 2.5.1
  - jruby-9.0.5.0
  - jruby-9.1.9.0
 gemfile:
@@ -18,14 +18,6 @@ services:
 matrix:
  fast_finish: true
  exclude:
- - rvm: 2.2.0
- gemfile: gemfiles/activerecord_5.0.2.gemfile
- - rvm: 2.2.0
- gemfile: gemfiles/activerecord_5.1.0.gemfile
- - rvm: 2.2.7
- gemfile: gemfiles/activerecord_5.0.2.gemfile
- - rvm: 2.2.7
- gemfile: gemfiles/activerecord_5.1.0.gemfile
  - rvm: jruby-9.0.5.0
  gemfile: gemfiles/activerecord_5.0.2.gemfile
  - rvm: jruby-9.1.9.0
@@ -42,7 +34,6 @@ notifications:
  email:
  recipients:
  - [email protected]
- - [email protected]
  on_success: change
  on_failure: change
 before_install: