Skip to content

Commit 8018beb

Browse files
committed
Drop Ruby 2.3 support (#34142).
git-svn-id: http://svn.redmine.org/redmine/trunk@20154 e93f8b46-1217-0410-a6f0-8f06a7374b81
1 parent 8d65078 commit 8018beb

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

Gemfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source 'https://rubygems.org'
22

3-
ruby '>= 2.3.0', '< 2.8.0'
3+
ruby '>= 2.4.0', '< 2.8.0'
44
gem 'bundler', '>= 1.12.0'
55

66
gem 'rails', '5.2.4.4'
@@ -17,7 +17,7 @@ gem "nokogiri", "~> 1.10.0"
1717
gem 'i18n', '~> 1.8.2'
1818
gem "rbpdf", "~> 1.20.0"
1919
gem 'addressable'
20-
gem 'rubyzip', (RUBY_VERSION < '2.4' ? '~> 1.3.0' : '~> 2.3.0')
20+
gem 'rubyzip', '~> 2.3.0'
2121

2222
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
2323
gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin]
@@ -85,11 +85,11 @@ end
8585
group :test do
8686
gem "rails-dom-testing"
8787
gem 'mocha', '>= 1.4.0'
88-
gem 'simplecov', (RUBY_VERSION < '2.4' ? '~> 0.17.0' : '~> 0.18.5'), :require => false
88+
gem 'simplecov', '~> 0.18.5', :require => false
8989
gem "ffi", platforms: [:mingw, :x64_mingw, :mswin]
9090
# For running system tests
9191
gem 'puma'
92-
gem 'capybara', (RUBY_VERSION < '2.4' ? '~> 3.15.1' : '~> 3.31.0')
92+
gem 'capybara', '~> 3.31.0'
9393
gem "selenium-webdriver"
9494
# RuboCop
9595
gem 'rubocop', '~> 0.81.0'

doc/INSTALL

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ http://www.redmine.org/
77

88
== Requirements
99

10-
* Ruby 2.3, 2.4, 2.5, 2.6, 2.7 (excluding 2.7.0 and 2.7.1)
10+
* Ruby 2.4, 2.5, 2.6, 2.7 (excluding 2.7.0 and 2.7.1)
1111
* Bundler >= 1.12.0
1212

1313
* A database:

test/unit/query_test.rb

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ class QueryTest < ActiveSupport::TestCase
3232
:workflows, :journals,
3333
:attachments, :time_entries
3434

35-
INTEGER_KLASS = RUBY_VERSION >= "2.4" ? Integer : Fixnum
36-
3735
def setup
3836
User.current = nil
3937
end
@@ -1955,7 +1953,7 @@ def test_issue_count_by_association_group
19551953
count_by_group = q.result_count_by_group
19561954
assert_kind_of Hash, count_by_group
19571955
assert_equal %w(NilClass User), count_by_group.keys.collect {|k| k.class.name}.uniq.sort
1958-
assert_equal %W(#{INTEGER_KLASS}), count_by_group.values.collect {|k| k.class.name}.uniq
1956+
assert_equal %W(Integer), count_by_group.values.collect {|k| k.class.name}.uniq
19591957
assert count_by_group.has_key?(User.find(3))
19601958
end
19611959

@@ -1964,7 +1962,7 @@ def test_issue_count_by_list_custom_field_group
19641962
count_by_group = q.result_count_by_group
19651963
assert_kind_of Hash, count_by_group
19661964
assert_equal %w(NilClass String), count_by_group.keys.collect {|k| k.class.name}.uniq.sort
1967-
assert_equal %W(#{INTEGER_KLASS}), count_by_group.values.collect {|k| k.class.name}.uniq
1965+
assert_equal %W(Integer), count_by_group.values.collect {|k| k.class.name}.uniq
19681966
assert count_by_group.has_key?('MySQL')
19691967
end
19701968

@@ -1973,7 +1971,7 @@ def test_issue_count_by_date_custom_field_group
19731971
count_by_group = q.result_count_by_group
19741972
assert_kind_of Hash, count_by_group
19751973
assert_equal %w(Date NilClass), count_by_group.keys.collect {|k| k.class.name}.uniq.sort
1976-
assert_equal %W(#{INTEGER_KLASS}), count_by_group.values.collect {|k| k.class.name}.uniq
1974+
assert_equal %W(Integer), count_by_group.values.collect {|k| k.class.name}.uniq
19771975
end
19781976

19791977
def test_issue_count_with_nil_group_only

0 commit comments

Comments
 (0)