Skip to content

Commit a3157d2

Browse files
committed
Merge branch 'master' into switch-on-development-not-production
2 parents 849eca9 + ccf2cb7 commit a3157d2

File tree

67 files changed

+91611
-19464
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+91611
-19464
lines changed

.github/workflows/ci.yaml

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
lint:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v4
9+
- uses: actions/checkout@v6
1010
- uses: ruby/setup-ruby@v1
1111
with:
1212
ruby-version: 3.4
@@ -19,7 +19,7 @@ jobs:
1919
with:
2020
redis-version: "7.x"
2121
- run: redis-cli ping
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v6
2323
- uses: ruby/setup-ruby@v1
2424
with:
2525
ruby-version: 3.4
@@ -49,15 +49,12 @@ jobs:
4949
ruby: head
5050
- gemfile: Gemfile
5151
ruby: 2.7 # lowest supported version
52-
- gemfile: gemfiles/rails_7.0.gemfile
53-
ruby: 3.1
54-
- gemfile: gemfiles/rails_7.0.gemfile
55-
ruby: 3.2
56-
- gemfile: gemfiles/rails_7.1.gemfile
57-
ruby: 3.3
58-
- gemfile: gemfiles/rails_master.gemfile
52+
- gemfile: gemfiles/rails_8.0.gemfile
5953
ruby: 3.3
6054
graphql_reject_numbers_followed_by_names: 1
55+
- gemfile: gemfiles/rails_8.1.gemfile
56+
ruby: 3.5
57+
graphql_reject_numbers_followed_by_names: 1
6158
redis: 1
6259
- gemfile: gemfiles/rails_master.gemfile
6360
ruby: 3.4
@@ -77,7 +74,7 @@ jobs:
7774
if: ${{ !!matrix.redis }}
7875
- run: redis-cli ping
7976
if: ${{ !!matrix.redis }}
80-
- uses: actions/checkout@v4
77+
- uses: actions/checkout@v6
8178
- uses: ruby/setup-ruby@v1
8279
with:
8380
ruby-version: ${{ matrix.ruby }}
@@ -87,8 +84,8 @@ jobs:
8784
javascript_test:
8885
runs-on: ubuntu-latest
8986
steps:
90-
- uses: actions/checkout@v4
91-
- uses: actions/setup-node@v4
87+
- uses: actions/checkout@v6
88+
- uses: actions/setup-node@v6
9289
with:
9390
node-version: '21'
9491
- run: npm ci
@@ -103,7 +100,7 @@ jobs:
103100
- gemfile: gemfiles/rails_master.gemfile
104101
ruby: 3.3
105102
isolation_level_fiber: 1
106-
- gemfile: gemfiles/rails_7.1_postgresql.gemfile
103+
- gemfile: gemfiles/rails_7.2_postgresql.gemfile
107104
ruby: 3.3
108105
services:
109106
postgres:
@@ -127,7 +124,7 @@ jobs:
127124
- run: echo GRAPHQL_CPARSER=1 > $GITHUB_ENV
128125
- run: echo ISOLATION_LEVEL_FIBER=1 > $GITHUB_ENV
129126
if: ${{ !!matrix.isolation_level_fiber }}
130-
- uses: actions/checkout@v4
127+
- uses: actions/checkout@v6
131128
- uses: ruby/setup-ruby@v1
132129
with:
133130
ruby-version: "3.3"
@@ -148,7 +145,7 @@ jobs:
148145
- 27017:27017
149146
steps:
150147
- run: echo BUNDLE_GEMFILE=${{ matrix.gemfile }} > $GITHUB_ENV
151-
- uses: actions/checkout@v4
148+
- uses: actions/checkout@v6
152149
- uses: ruby/setup-ruby@v1
153150
with:
154151
ruby-version: 3.4

.github/workflows/pronto.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
steps:
99
- run: echo BUNDLE_GEMFILE=gemfiles/pronto.gemfile > $GITHUB_ENV
1010
- name: Checkout code
11-
uses: actions/checkout@v4
11+
uses: actions/checkout@v6
1212
- run: git fetch --no-tags --prune --unshallow origin +refs/heads/*:refs/remotes/origin/*
1313
- name: Setup Ruby
1414
uses: ruby/setup-ruby@v1

.github/workflows/website.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ jobs:
2727
runs-on: ubuntu-latest
2828
steps:
2929
- name: Checkout master
30-
uses: actions/checkout@v4
30+
uses: actions/checkout@v6
3131
- name: Checkout GitHub pages branch
32-
uses: actions/checkout@v4
32+
uses: actions/checkout@v6
3333
with:
3434
path: gh-pages
3535
ref: gh-pages
@@ -63,11 +63,11 @@ jobs:
6363
runs-on: ubuntu-latest
6464
steps:
6565
- name: Checkout release tag
66-
uses: actions/checkout@v4
66+
uses: actions/checkout@v6
6767
with:
6868
ref: ${{ env.GITHUB_REF }}
6969
- name: Checkout GitHub pages branch
70-
uses: actions/checkout@v4
70+
uses: actions/checkout@v6
7171
with:
7272
path: gh-pages
7373
ref: gh-pages
@@ -78,10 +78,10 @@ jobs:
7878
- name: Build API docs
7979
run: |
8080
bundle exec rake site:fetch_latest apidocs:gen_version["${{ inputs.publish_version || env.GITHUB_REF }}"]
81-
- name: Commit changes as last committer
81+
- name: Commit changes as rmosolgo
8282
run: |
8383
git config --global user.name rmosolgo
84-
git config --global user.email rdmosolgo@github.com
84+
git config --global user.email rdmosolgo@gmail.com
8585
git status
8686
bundle exec rake site:commit_changes
8787
git status

CHANGELOG-enterprise.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,18 @@
88

99
### Bug Fix
1010

11+
# 1.6.0 (25 Nov 2025)
12+
13+
- `RuntimeLimiter` and `ActiveOperationLimiter` now support `Redis::Cluster` via `redis_cluster: ...` options #5465
14+
15+
# 1.5.9 (21 Nov 2025)
16+
17+
- RuntimeLimiter: improve compatibility with ObjectCache
18+
19+
# 1.5.8 (19 Sep 2025)
20+
21+
- ObjectCache: Fix deprecation regarding `Resolve.resolve_all` by using a forward-compatible approach to lazy value resolution #5437
22+
1123
# 1.5.7 (2 May 2025)
1224

1325
- ObjectCache: Use Rails's `.cache_key_with_version` in `CacheableRelation` for proper cache busting

CHANGELOG-pro.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,24 @@
66

77
### New Features
88

9+
# 1.29.14 (21 Nov 2025)
10+
11+
- Add configuration for `ostruct` dependency
12+
13+
# 1.29.13 (22 Sept 2025)
14+
15+
- Stable connections: fix condition grouping with IS NULL #5435
16+
- `@defer`: Correctly handle fields where `@defer` is present twice #5434
17+
- `@defer`: Update implementation to address warnings in GraphQL-Ruby 2.5.12+
18+
19+
# 1.29.12 (12 Sept 2025)
20+
21+
- `OperationStore`: also support `visibility_profile:` on lazy routes.
22+
23+
# 1.29.11 (12 Sept 2025)
24+
25+
- `OperationStore`: add `visibility_profile: ...` argument to `operation_store_sync` so that incoming operations are bound to the given profile.
26+
927
# 1.29.10 (3 Jun 2025)
1028

1129
- `@defer`, `@stream`: Include `"data"` in the payload, if there is any, even if there are `"errors"` #5365

CHANGELOG.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,30 @@
1010

1111
### Bug fixes
1212

13+
# 2.5.14 (8 Oct 2025)
14+
15+
### Bug fixes
16+
17+
- Fix error when GraphQL-Batch is used (???) #5444
18+
19+
# 2.5.13 (22 Sep 2025)
20+
21+
### New features
22+
23+
- Testing helpers: support `visibility_profile: ...` #5439
24+
25+
### Bug fixes
26+
27+
- Directives: correctly handle schema directive arguments which are lists of input objects #5440
28+
29+
# 2.5.12 (15 Sep 2025)
30+
31+
### New features
32+
33+
- Runtime: add hooks for experimental custom runtimes #5425, #5429
34+
- Lazy handling and Dataloader have been merged under the hood #5422
35+
- Doc: merk `load_application_object_failed` as public #5426
36+
1337
# 2.5.11 (9 Jul 2025)
1438

1539
### Bug fixes

gemfiles/mongoid_8.gemfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ gem "mongoid", "~> 8.0"
1111
gem "libev_scheduler"
1212
gem "evt"
1313
gem "async"
14-
gem "fiber-storage"
1514
gem "concurrent-ruby", "1.3.4"
1615

1716
gemspec path: "../"

gemfiles/mongoid_9.gemfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,5 @@ gem "mongoid", "~> 9.0"
1010
gem "libev_scheduler"
1111
gem "evt"
1212
gem "async"
13-
gem "fiber-storage"
1413

1514
gemspec path: "../"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ gem "bootsnap"
66
gem "ruby-prof", platform: :ruby
77
gem "pry"
88
gem "pry-stack_explorer", platform: :ruby
9-
gem "rails", "~> 7.1.0", require: "rails/all"
9+
gem "rails", "~> 7.2.0", require: "rails/all"
1010
gem "pg", platform: :ruby
1111
gem "sequel"
1212
gem "evt"
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ gem "bootsnap"
66
gem "ruby-prof", platform: :ruby
77
gem "pry"
88
gem "pry-stack_explorer", platform: :ruby
9-
gem "rails", "~> 7.1.0", require: "rails/all"
10-
gem "sqlite3", "~>1.4"
9+
gem "rails", "~> 8.0.0", require: "rails/all"
10+
gem "sqlite3"
1111
gem "pg", platform: :ruby
1212
gem "sequel"
1313
gem "evt"

0 commit comments

Comments
 (0)