Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-12-16 05:20:28 +01:00
Code Issues Packages Projects Releases Activity

Drop Ruby 2.3 support (#34142).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@20154 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2020-10-21 02:41:13 +00:00
parent 8d65078826
commit 8018beb5f0
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Gemfile
View File

@@ -1,6 +1,6 @@
source 'https://rubygems.org' source 'https://rubygems.org'
ruby '>= 2.3.0', '< 2.8.0' ruby '>= 2.4.0', '< 2.8.0'
gem 'bundler', '>= 1.12.0' gem 'bundler', '>= 1.12.0'
gem 'rails', '5.2.4.4' gem 'rails', '5.2.4.4'
@@ -17,7 +17,7 @@ gem "nokogiri", "~> 1.10.0"
gem 'i18n', '~> 1.8.2' gem 'i18n', '~> 1.8.2'
gem "rbpdf", "~> 1.20.0" gem "rbpdf", "~> 1.20.0"
gem 'addressable' gem 'addressable'
gem 'rubyzip', (RUBY_VERSION < '2.4' ? '~> 1.3.0' : '~> 2.3.0') gem 'rubyzip', '~> 2.3.0'
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin] gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin]
@@ -85,11 +85,11 @@ end
group :test do group :test do
gem "rails-dom-testing" gem "rails-dom-testing"
gem 'mocha', '>= 1.4.0' gem 'mocha', '>= 1.4.0'
gem 'simplecov', (RUBY_VERSION < '2.4' ? '~> 0.17.0' : '~> 0.18.5'), :require => false gem 'simplecov', '~> 0.18.5', :require => false
gem "ffi", platforms: [:mingw, :x64_mingw, :mswin] gem "ffi", platforms: [:mingw, :x64_mingw, :mswin]
# For running system tests # For running system tests
gem 'puma' gem 'puma'
gem 'capybara', (RUBY_VERSION < '2.4' ? '~> 3.15.1' : '~> 3.31.0') gem 'capybara', '~> 3.31.0'
gem "selenium-webdriver" gem "selenium-webdriver"
# RuboCop # RuboCop
gem 'rubocop', '~> 0.81.0' gem 'rubocop', '~> 0.81.0'

2
doc/INSTALL
View File

@@ -7,7 +7,7 @@ http://www.redmine.org/
== Requirements == Requirements
* Ruby 2.3, 2.4, 2.5, 2.6, 2.7 (excluding 2.7.0 and 2.7.1) * Ruby 2.4, 2.5, 2.6, 2.7 (excluding 2.7.0 and 2.7.1)
* Bundler >= 1.12.0 * Bundler >= 1.12.0
* A database: * A database:

8
test/unit/query_test.rb
View File

@@ -32,8 +32,6 @@ class QueryTest < ActiveSupport::TestCase
:workflows, :journals, :workflows, :journals,
:attachments, :time_entries :attachments, :time_entries
INTEGER_KLASS = RUBY_VERSION >= "2.4" ? Integer : Fixnum
def setup def setup
User.current = nil User.current = nil
end end
@@ -1955,7 +1953,7 @@ class QueryTest < ActiveSupport::TestCase
count_by_group = q.result_count_by_group count_by_group = q.result_count_by_group
assert_kind_of Hash, count_by_group assert_kind_of Hash, count_by_group
assert_equal %w(NilClass User), count_by_group.keys.collect {|k| k.class.name}.uniq.sort assert_equal %w(NilClass User), count_by_group.keys.collect {|k| k.class.name}.uniq.sort
assert_equal %W(#{INTEGER_KLASS}), count_by_group.values.collect {|k| k.class.name}.uniq assert_equal %W(Integer), count_by_group.values.collect {|k| k.class.name}.uniq
assert count_by_group.has_key?(User.find(3)) assert count_by_group.has_key?(User.find(3))
end end
@@ -1964,7 +1962,7 @@ class QueryTest < ActiveSupport::TestCase
count_by_group = q.result_count_by_group count_by_group = q.result_count_by_group
assert_kind_of Hash, count_by_group assert_kind_of Hash, count_by_group
assert_equal %w(NilClass String), count_by_group.keys.collect {|k| k.class.name}.uniq.sort assert_equal %w(NilClass String), count_by_group.keys.collect {|k| k.class.name}.uniq.sort
assert_equal %W(#{INTEGER_KLASS}), count_by_group.values.collect {|k| k.class.name}.uniq assert_equal %W(Integer), count_by_group.values.collect {|k| k.class.name}.uniq
assert count_by_group.has_key?('MySQL') assert count_by_group.has_key?('MySQL')
end end
@@ -1973,7 +1971,7 @@ class QueryTest < ActiveSupport::TestCase
count_by_group = q.result_count_by_group count_by_group = q.result_count_by_group
assert_kind_of Hash, count_by_group assert_kind_of Hash, count_by_group
assert_equal %w(Date NilClass), count_by_group.keys.collect {|k| k.class.name}.uniq.sort assert_equal %w(Date NilClass), count_by_group.keys.collect {|k| k.class.name}.uniq.sort
assert_equal %W(#{INTEGER_KLASS}), count_by_group.values.collect {|k| k.class.name}.uniq assert_equal %W(Integer), count_by_group.values.collect {|k| k.class.name}.uniq
end end
def test_issue_count_with_nil_group_only def test_issue_count_with_nil_group_only