Skip to content

Commit

Permalink
Merge a4732c3 into 98213b7
Browse files Browse the repository at this point in the history
  • Loading branch information
jdufresne committed Jan 3, 2023
2 parents 98213b7 + a4732c3 commit 8102b9f
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 25 deletions.
15 changes: 0 additions & 15 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@ jobs:
adapter: [sqlite3]
asset: [webpack]
include:
- ruby: 2.6
gemfile: gemfiles/rails_6.0.gemfile
orm: active_record
adapter: sqlite3
asset: sprockets
- ruby: 2.7
gemfile: gemfiles/rails_6.1.gemfile
orm: active_record
Expand Down Expand Up @@ -54,16 +49,6 @@ jobs:
orm: mongoid
adapter: sqlite3
asset: sprockets
- ruby: jruby-9.3
gemfile: gemfiles/rails_6.1.gemfile
orm: active_record
adapter: mysql2
asset: sprockets
- ruby: jruby-9.3
gemfile: gemfiles/rails_6.1.gemfile
orm: mongoid
adapter: sqlite3
asset: sprockets
runs-on: ubuntu-latest
services:
mysql:
Expand Down
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ AllCops:
- "vendor/bundle/**/*"
NewCops: disable
SuggestExtensions: false
TargetRubyVersion: 2.6
TargetRubyVersion: 2.7

Gemspec/DeprecatedAttributeAssignment:
Enabled: true
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ If you think you found a bug in RailsAdmin, you can [submit an issue](https://gi

This library aims to support and is [tested against][ghactions] the following Ruby implementations:

- Ruby 2.6
- Ruby 2.7
- Ruby 3.0
- [JRuby][]
Expand Down
7 changes: 0 additions & 7 deletions lib/rails_admin/support/csv_converter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,6 @@ def initialize(objects = [], schema = nil)
end

def to_csv(options = {})
if CSV::VERSION == '3.0.2'
raise <<~MSG
CSV library bundled with Ruby 2.6.0 has encoding issue, please upgrade Ruby to 2.6.1 or later.
https://github.com/ruby/csv/issues/62
MSG
end

options = HashWithIndifferentAccess.new(options)
encoding_to = Encoding.find(options[:encoding_to]) if options[:encoding_to].present?

Expand Down
2 changes: 1 addition & 1 deletion rails_admin.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
spec.homepage = 'https://github.com/railsadminteam/rails_admin'
spec.name = 'rails_admin'
spec.require_paths = %w[lib]
spec.required_ruby_version = '>= 2.6.0'
spec.required_ruby_version = '>= 2.7.0'
spec.required_rubygems_version = '>= 1.8.11'
spec.summary = 'Admin for Rails'
spec.version = RailsAdmin::Version
Expand Down

0 comments on commit 8102b9f

Please sign in to comment.