Merge branch '0-10-stable' into prevent_creation_of_unnecessary_fieldset

Author: abcang

.travis.yml

@@ -8,6 +8,7 @@ _ruby_supported_versions:
   - &ruby_2_4 2.4.9
   - &ruby_2_5 2.5.7
   - &ruby_2_6 2.6.5
+  - &ruby_2_7 2.7.0
   - &ruby_head ruby-head
 
 _jruby_supported_versions:
@@ -64,16 +65,17 @@ rvm:
   - *ruby_2_1
   - *ruby_2_2
   - *ruby_2_3
-  - *ruby_2_4
-  - *ruby_2_5
-  - *ruby_2_6
+  - *ruby_2_7
   - *ruby_head
 
 branches:
   only: 0-10-stable
 
 jobs:
   include:
+    - { rvm: *ruby_2_4,  env: *rails_4_2 }
+    - { rvm: *ruby_2_5,  env: *rails_4_2 }
+    - { rvm: *ruby_2_6,  env: *rails_4_2 }
     - { rvm: *jruby_9_1,  jdk: *jdk_8, env: *rails_4_1_jruby }
     - { rvm: *jruby_9_1,  jdk: *jdk_8, env: *rails_4_2_jruby }
     - { rvm: *jruby_9_1,  jdk: *jdk_8, env: *rails_5_0_jruby }
@@ -95,9 +97,6 @@ jobs:
     - { rvm: *jruby_head, jdk: *jdk_8, env: *rails_master_jruby }
 
   exclude:
-    - { rvm: *ruby_2_4,  env: *rails_4_1 }
-    - { rvm: *ruby_2_5,  env: *rails_4_1 }
-    - { rvm: *ruby_2_6,  env: *rails_4_1 }
     - { rvm: *ruby_head, env: *rails_4_1 }
 
     - { rvm: *ruby_2_1,  env: *rails_5_0 }
@@ -107,16 +106,12 @@ jobs:
     - { rvm: *ruby_2_1,  env: *rails_6_0 }
     - { rvm: *ruby_2_2,  env: *rails_6_0 }
     - { rvm: *ruby_2_3,  env: *rails_6_0 }
-    - { rvm: *ruby_2_4,  env: *rails_6_0 }
 
     - { rvm: *ruby_2_1,  env: *rails_master }
     - { rvm: *ruby_2_2,  env: *rails_master }
     - { rvm: *ruby_2_3,  env: *rails_master }
-    - { rvm: *ruby_2_4,  env: *rails_master }
 
   allow_failures:
-    - { rvm: *ruby_2_5,  env: *rails_master }
-    - { rvm: *ruby_2_6,  env: *rails_master }
 
     - rvm: *ruby_head
 

appveyor.yml

@@ -14,9 +14,9 @@ cache:
 
 install:
   - SET PATH=C:\%ruby_version%\bin;%PATH%
-  - gem uninstall bundler -a -x -I
-  - gem update --system 2.7.9
-  - # gem install bundler -v '1.17.3'
+  - gem uninstall bundler -x
+  - # gem update --system 2.7.9
+  - gem install bundler -v '1.17.3'
   - bundle env
   - bundle check || bundle install --path=vendor/bundle --retry=3 --jobs=3
   - bundle clean --force