Merge branch 'ruby-2.7'

Fixes #609
mislav · Feb 19, 2020 · a857575 · a857575
2 parents f63844a + 8dc3b99
commit a857575
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 Gemfile*.lock
+Brewfile.lock.json
 .bundle
 doc
 *.gem

diff --git a/.travis.yml b/.travis.yml
@@ -17,6 +17,7 @@ rvm:
   - 2.4.5
   - 2.5.3
   - 2.6.3
+  - 2.7.0
 gemfile:
   - Gemfile
   - Gemfile.rails3.0
@@ -47,30 +48,42 @@ matrix:
       gemfile: Gemfile.rails3.0
     - rvm: 2.6.3
       gemfile: Gemfile.rails3.0
+    - rvm: 2.7.0
+      gemfile: Gemfile.rails3.0
     - rvm: 2.4.5
       gemfile: Gemfile.rails3.1
     - rvm: 2.5.3
       gemfile: Gemfile.rails3.1
     - rvm: 2.6.3
       gemfile: Gemfile.rails3.1
+    - rvm: 2.7.0
+      gemfile: Gemfile.rails3.1
     - rvm: 2.4.5
       gemfile: Gemfile.rails3.2
     - rvm: 2.5.3
       gemfile: Gemfile.rails3.2
     - rvm: 2.6.3
       gemfile: Gemfile.rails3.2
+    - rvm: 2.7.0
+      gemfile: Gemfile.rails3.2
     - rvm: 2.4.5
       gemfile: Gemfile.rails4.0
     - rvm: 2.5.3
       gemfile: Gemfile.rails4.0
     - rvm: 2.6.3
       gemfile: Gemfile.rails4.0
+    - rvm: 2.7.0
+      gemfile: Gemfile.rails4.0
     - rvm: 2.4.5
       gemfile: Gemfile.rails4.1
     - rvm: 2.5.3
       gemfile: Gemfile.rails4.1
     - rvm: 2.6.3
       gemfile: Gemfile.rails4.1
+    - rvm: 2.7.0
+      gemfile: Gemfile.rails4.1
+    - rvm: 2.7.0
+      gemfile: Gemfile.rails4.2
     - rvm: 1.9.3
       gemfile: Gemfile.rails5.0
     - rvm: 2.1.8

diff --git a/Brewfile b/Brewfile
@@ -1,3 +1,3 @@
-brew 'mongodb', restart_service: true
-brew 'mysql@5.6', restart_service: true
+brew 'mongodb/brew/mongodb-community@4.0', restart_service: true
+brew 'mysql@5.7', restart_service: true
 brew 'postgresql', restart_service: true
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-rails_version = '~> 6.0.0'
+rails_version = '~> 6.0.2'
 
 gem 'activerecord', rails_version
 gem 'actionpack',   rails_version

diff --git a/Gemfile.rails4.2 b/Gemfile.rails4.2
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-rails_version = '~> 4.2.8'
+rails_version = '~> 4.2.11.1'
 
 gem 'activerecord', rails_version
 gem 'actionpack',   rails_version

diff --git a/Gemfile.rails5.0 b/Gemfile.rails5.0
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-rails_version = '~> 5.0.3'
+rails_version = '~> 5.0.7.2'
 
 gem 'activerecord', rails_version
 gem 'actionpack',   rails_version

diff --git a/Gemfile.rails5.1 b/Gemfile.rails5.1
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-rails_version = '~> 5.1.1'
+rails_version = '~> 5.1.7'
 
 gem 'activerecord', rails_version
 gem 'actionpack',   rails_version

diff --git a/Gemfile.rails5.2 b/Gemfile.rails5.2
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-rails_version = '~> 5.2.0'
+rails_version = '~> 5.2.4.1'
 
 gem 'activerecord', rails_version
 gem 'actionpack',   rails_version

diff --git a/lib/will_paginate/i18n.rb b/lib/will_paginate/i18n.rb
@@ -8,10 +8,10 @@ def self.load_path
       Dir["#{locale_dir}/*.{rb,yml}"]
     end
 
-    def will_paginate_translate(keys, options = {})
+    def will_paginate_translate(keys, options = {}, &block)
       if defined? ::I18n
         defaults = Array(keys).dup
-        defaults << Proc.new if block_given?
+        defaults << block if block_given?
         ::I18n.translate(defaults.shift, options.merge(:default => defaults, :scope => :will_paginate))
       else
         key = Array === keys ? keys.first : keys

diff --git a/script/bootstrap b/script/bootstrap
@@ -4,7 +4,7 @@ set -e
 
 if type -p brew >/dev/null; then
   brew bundle --no-upgrade
-  export PATH="$(brew --prefix mysql@5.6)/bin:$PATH"
+  export PATH="$(brew --prefix mysql@5.7)/bin:$PATH"
 
   while [ ! -e /tmp/mysql.sock ] && [ ! -e /var/run/mysql5/mysqld.sock ]; do
     echo "Waiting for mysql to start up ..." >&2

diff --git a/script/ci-matrix b/script/ci-matrix
@@ -12,7 +12,7 @@ requirements = {
   'Gemfile.rails3.2'   => Gem::Requirement.new('< 2.4'),
   'Gemfile.rails4.0'   => Gem::Requirement.new(['< 2.4', '>= 1.9']),
   'Gemfile.rails4.1'   => Gem::Requirement.new(['< 2.4', '>= 1.9']),
-  'Gemfile.rails4.2'   => Gem::Requirement.new('>= 1.9'),
+  'Gemfile.rails4.2'   => Gem::Requirement.new(['>= 1.9', '< 2.7']),
   'Gemfile.rails5.0'   => Gem::Requirement.new('>= 2.2'),
   'Gemfile.rails5.1'   => Gem::Requirement.new('>= 2.2'),
   'Gemfile.rails5.2'   => Gem::Requirement.new('>= 2.2'),