Skip to content

Commit 15f0ddb

Browse files
TonyCTHsuTonyCTHsu
committed
Merge branch 'master' into tonycthsu/datadog-tracing-span-type-change
2 parents c8df6bc + d196056 commit 15f0ddb

File tree

77 files changed

+1592
-560
lines changed

Some content is hidden

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

77 files changed

+1592
-560
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,17 @@ jobs:
4444
include:
4545
- gemfile: Gemfile
4646
ruby: 3.2
47-
- gemfile: gemfiles/rails_5.2.gemfile
48-
ruby: 2.7
4947
# Rails 6.1 is tested with Postgresql below
5048
- gemfile: gemfiles/rails_7.0.gemfile
5149
ruby: 3.1
5250
- gemfile: gemfiles/rails_master.gemfile
5351
ruby: 3.1
5452
- gemfile: gemfiles/rails_7.0.gemfile
5553
ruby: 3.2
54+
- gemfile: gemfiles/rails_7.1.gemfile
55+
ruby: 3.3
5656
- gemfile: gemfiles/rails_master.gemfile
57-
ruby: 3.2
57+
ruby: 3.3
5858
runs-on: ubuntu-latest
5959
steps:
6060
- run: echo BUNDLE_GEMFILE=${{ matrix.gemfile }} > $GITHUB_ENV

‎CHANGELOG-enterprise.md‎

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

99
### Bug Fix
1010

11+
# 1.3.2 (15 Jan 2023)
12+
13+
### Bug Fix
14+
15+
- Migrate to new `trace_with` instrumentation API, requires GraphQL-Ruby 2.0.18+
16+
1117
# 1.3.1 (12 June 2023)
1218

1319
### Bug Fix

‎CHANGELOG-pro.md‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,20 @@
66

77
### New Features
88

9+
# 1.26.0 (19 Jan 2023)
10+
11+
### Breaking Changes
12+
13+
- Pundit integration: when the integration encounters an Array, it tries to find a configured policy class. If it can't, it raises an error.
14+
15+
Previously, the integration silently permitted all items in the array; this default has been changed. See #4726 for more discussion of this change.
16+
917
# 1.25.2 (29 Dec 2023)
1018

1119
### New Features
1220

1321
- Subscriptions: send `more: false` when the server calls `unsubscribe`
1422

15-
### Bug Fix
16-
1723
# 1.25.1 (21 Dec 2023)
1824

1925
### Bug Fix

‎CHANGELOG.md‎

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

1111
### Bug fixes
1212

13+
# 2.2.5 (10 Jan 2024)
14+
15+
### Bug fixes
16+
17+
- Parser: fix enum values named `type` #4772
18+
- GraphQL::Deprecation: remove this unused helper module #4769
19+
1320
# 2.2.4 (3 Jan 2024)
1421

1522
### Bug fixes

‎gemfiles/rails_7.0.gemfile‎

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.0", require: "rails/all"
9+
gem "rails", "~> 7.0.0", require: "rails/all"
1010
gem "sqlite3", "~> 1.4", platform: :ruby
1111
gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
1212
gem "sequel"

‎gemfiles/rails_5.2.gemfile‎ renamed to ‎gemfiles/rails_7.1.gemfile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,12 @@ gem "bootsnap"
66
gem "ruby-prof", platform: :ruby
77
gem "pry"
88
gem "pry-stack_explorer", platform: :ruby
9-
gem "rails", "~> 5.2.0", require: "rails/all"
9+
gem "rails", "~> 7.1.0", require: "rails/all"
1010
gem "sqlite3", "~> 1.4", platform: :ruby
11+
gem "pg", platform: :ruby
1112
gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
1213
gem "sequel"
14+
gem "evt"
15+
gem "async"
1316

1417
gemspec path: "../"

‎guides/_layouts/default.html‎

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,45 @@
1313
<link rel="icon" href="{{ site.baseurl }}/graphql-ruby-icon.png">
1414
</head>
1515
<body>
16+
<script>
17+
function detectDarkTheme(toggle) {
18+
var prefersDarkSchemeSetting = localStorage.getItem("prefersDarkScheme")
19+
if (prefersDarkSchemeSetting == null) {
20+
prefersDarkScheme = window.matchMedia('(prefers-color-scheme: dark)').matches
21+
} else {
22+
prefersDarkScheme = prefersDarkSchemeSetting == "true"
23+
}
24+
25+
if (toggle) {
26+
if (prefersDarkScheme) {
27+
prefersDarkScheme = false
28+
localStorage.setItem("prefersDarkScheme", "false")
29+
} else {
30+
prefersDarkScheme = true
31+
localStorage.setItem("prefersDarkScheme", "true")
32+
}
33+
}
34+
35+
if (prefersDarkScheme) {
36+
document.body.classList.add('dark-theme');
37+
document.querySelectorAll(".graphql-ruby-img").forEach(function(el) {
38+
el.src = "{{ site.baseurl }}/graphql-ruby-dark.png"
39+
})
40+
} else {
41+
document.body.classList.remove('dark-theme');
42+
document.querySelectorAll(".graphql-ruby-img").forEach(function(el) {
43+
el.src = "{{ site.baseurl }}/graphql-ruby.png"
44+
})
45+
}
46+
}
47+
48+
detectDarkTheme(false)
49+
</script>
1650
<div class="header">
1751
<div class="header-container">
1852
<div class="nav">
1953
<a href="{{ site.baseurl }}/" class="img-link">
20-
<img src="{{ site.baseurl }}/graphql-ruby.png" alt="GraphQL Ruby Logo" />
54+
<img class="graphql-ruby-img" src="{{ site.baseurl }}/graphql-ruby.png" alt="GraphQL Ruby Logo" />
2155
</a>
2256
<a href="{{ site.baseurl }}/getting_started">Get Started</a>
2357
<a href="{{ site.baseurl }}/guides">Guides</a>
@@ -31,6 +65,7 @@
3165
type="text"
3266
placeholder="Search the docs..."
3367
/>
68+
<a href="#" onclick="event.preventDefault(); detectDarkTheme(true)" class="dark-theme-button"></a>
3469
</div>
3570
</div>
3671
<div class="search-results-container">
@@ -43,5 +78,8 @@
4378
</div>
4479
<script src="https://cdn.jsdelivr.net/algoliasearch/3/algoliasearchLite.min.js"></script>
4580
<script src="{{ site.baseurl }}/js/search.js"></script>
81+
<script>
82+
detectDarkTheme(false) // do it again to update the images
83+
</script>
4684
</body>
4785
</html>

‎guides/authorization/pundit_integration.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,6 @@ module BaseInterface
130130
end
131131
```
132132

133-
Pundit scopes [don't play well](https://github.com/rmosolgo/graphql-ruby/issues/2008) with `Array`s, so the integration _skips_ scopes on Arrays. You can also opt out on a field-by-field basis as described below.
134-
135-
You can also customize how the scopes are looked up and applied, see below.
136-
137133
#### Bypassing scopes
138134

139135
To allow an unscoped relation to be returned from a field, disable scoping with `scope: false`, for example:

0 commit comments

Comments
 (0)