Skip to content

Commit 9dd68ca

Browse files
authored
Merge pull request #391 from brainspec/prepare-release
Prepare for release
2 parents 3850be1 + bf927d3 commit 9dd68ca

File tree

6 files changed

+23
-7
lines changed

6 files changed

+23
-7
lines changed

.github/workflows/ruby.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,12 @@ jobs:
3232
strategy:
3333
fail-fast: false
3434
matrix:
35-
ruby-version: ['2.5', '2.6', '2.7', '3.0.2']
35+
ruby-version: ['2.6', '2.7', '3.0.2']
3636
gemfile:
3737
- Gemfile
3838
- Gemfile.rails60
3939
- Gemfile.rails61
40+
- Gemfile.rails70
4041
- Gemfile.railsmaster
4142
- Gemfile.mongo_mapper
4243
db:
@@ -50,8 +51,8 @@ jobs:
5051
gemfile: Gemfile
5152
- ruby-version: '3.0.2'
5253
gemfile: Gemfile.mongo_mapper
53-
- ruby-version: '2.5'
54-
gemfile: Gemfile.railsmaster
54+
- ruby-version: '2.6'
55+
gemfile: Gemfile.rails70
5556
- ruby-version: '2.6'
5657
gemfile: Gemfile.railsmaster
5758
env:

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## master
1+
## 2.5.0 (December 24, 2021)
22

33
### enhancements
44

Gemfile.rails70

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
eval_gemfile('Gemfile.global')
2+
3+
gem 'minitest', '~> 5.8'
4+
gem 'rails', github: 'rails/rails', branch: '7-0-stable', require: false
5+
6+
# TODO: Mongoid doesn't support Rails 7 yet. Uncomment when it's fixed https://jira.mongodb.org/browse/MONGOID-5193
7+
# gem 'mongoid', github: 'mongodb/mongoid'
8+
9+
gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Or install it yourself as:
4646

4747
## Supported Versions
4848

49-
- Ruby 2.5+
49+
- Ruby 2.6+
5050
- Rails 5.2+
5151

5252
## Usage

lib/enumerize/version.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
22

33
module Enumerize
4-
VERSION = '2.4.0'
4+
VERSION = '2.5.0'
55
end

test/activerecord_test.rb

+7-1
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,18 @@
3838
'schema_search_path' => 'public'
3939
}
4040
}
41+
4142
case db
4243
when :postgresql
4344
ActiveRecord::Base.establish_connection(:postgresql_master)
4445
ActiveRecord::Base.connection.recreate_database('enumerize_test')
4546
when :mysql2
46-
ActiveRecord::Tasks::DatabaseTasks.create ActiveRecord::Base.configurations[db.to_s]
47+
if ActiveRecord::Base.configurations.respond_to?(:[])
48+
ActiveRecord::Tasks::DatabaseTasks.create ActiveRecord::Base.configurations[db.to_s]
49+
else
50+
ActiveRecord::Tasks::DatabaseTasks.create ActiveRecord::Base.configurations.find_db_config(db.to_s)
51+
end
52+
4753
ActiveRecord::Base.establish_connection(db)
4854
else
4955
ActiveRecord::Base.establish_connection(db)

0 commit comments

Comments
 (0)