Skip to content

Commit 43de9c7

Browse files
committed
Merge branch 'master' into rails-8-1-support
2 parents 29a404c + 81a0f09 commit 43de9c7

File tree

7 files changed

+8
-16
lines changed

7 files changed

+8
-16
lines changed

.github/workflows/linting.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
name: Yamllint
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v4
9+
- uses: actions/checkout@v6
1010
- name: Yamllint
1111
uses: karancode/yamllint-github-action@master
1212
with:

.github/workflows/rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v6
1515
- name: Set up Ruby 3.4
1616
uses: ruby/setup-ruby@v1
1717
with:

.github/workflows/ruby_head.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
--health-retries 10
4040
4141
steps:
42-
- uses: actions/checkout@v4
42+
- uses: actions/checkout@v6
4343
- name: Set up Ruby
4444
uses: ruby/setup-ruby@v1
4545
with:

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
--health-timeout 5s
4949
--health-retries 10
5050
steps:
51-
- uses: actions/checkout@v4
51+
- uses: actions/checkout@v6
5252
- name: Set up Ruby
5353
uses: ruby/setup-ruby@v1
5454
with:

.github/workflows/test_11g.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
--health-timeout 5s
5151
--health-retries 10
5252
steps:
53-
- uses: actions/checkout@v4
53+
- uses: actions/checkout@v6
5454
- name: Set up Ruby
5555
uses: ruby/setup-ruby@v1
5656
with:

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ group :development do
88
gem "rspec"
99
gem "rdoc"
1010
gem "rake"
11-
gem "activerecord", github: "rails/rails", branch: "8-1-stable"
11+
gem "activerecord", github: "rails/rails", branch: "main"
1212
gem "ruby-plsql", github: "rsim/ruby-plsql", branch: "master"
1313

1414
platforms :ruby do

README.md

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,11 @@ Oracle enhanced adapter for ActiveRecord
66
DESCRIPTION
77
-----------
88

9-
Oracle enhanced ActiveRecord adapter provides Oracle database access from Ruby on Rails applications. Oracle enhanced adapter can be used from Ruby on Rails versions between 2.3.x and 8.1 and it is working with Oracle database versions 10g and higher
9+
10+
Oracle enhanced ActiveRecord adapter provides Oracle database access from Ruby on Rails applications. Oracle enhanced adapter can be used from Ruby on Rails versions between 2.3.x and 8.0 and it is working with Oracle database versions 10g and higher
1011

1112
INSTALLATION
1213
------------
13-
### Rails 8.1
14-
15-
Oracle enhanced adapter version 8.1 supports Rails 8.1
16-
When using Ruby on Rails version 8.1 then in Gemfile include
17-
18-
```ruby
19-
# Use oracle as the database for Active Record
20-
gem 'activerecord-oracle_enhanced-adapter', '~> 8.1.0'
21-
```
2214

2315
### Rails 8.0
2416

0 commit comments

Comments
 (0)