Merge branch 'master' into cparser-encoding-fix

bluedone · May 30, 2023 · 6eba091 · 6eba091
2 parents 41f1392 + da41589
commit 6eba091
Show file tree

Hide file tree

Showing 31 changed files with 459 additions and 145 deletions.
diff --git a/CHANGELOG-enterprise.md b/CHANGELOG-enterprise.md
@@ -8,6 +8,12 @@
 
 ### Bug Fix
 
+# 1.3.0 (29 May 2023)
+
+### New Features
+
+- Changesets: Add `added_in: ...` and `removed_in: ...` for inline definition changes
+
 # 1.2.0 (10 February 2023)
 
 ### New Features

diff --git a/CHANGELOG-pro.md b/CHANGELOG-pro.md
@@ -8,6 +8,14 @@
 
 ### Bug Fix
 
+# 1.24.6 (24 May 2023)
+
+- Defer: Add `incremental: true` for new proposed wire format, add example for working with GraphQL-Batch #4477
+
+# 1.24.5 (24 May 2023)
+
+- Stable relation connection: Quote table names and column names in selects and orders #4485
+
 # 1.24.4 (18 April 2023)
 
 ### Bug Fix

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,26 @@
 
 ### Bug fixes
 
+# 2.0.22 (17 May 2023)
+
+### New features
+
+- Warden: manually instantiating doesn't require a `filter` instance #4462
+
+### Bug fixes
+
+- Enum: fix procs for enum values #4474
+- Lexer: force UTF-8 encoding #4467
+- Trace: inherit superclass `trace_options` #4470
+- Dataloader: properly run mutations in sequence #4461
+- NotificationsTrace: Add `execute_multiplex.graphql` event #4460
+- Fix `Context#dig` when called with one key #4458
+- Performance: Use a plain hash for selection sets at runtime #4453
+- Performance: Memoize current trace #4450, #4452
+- Performance: Pass is_non_null to runtime check #4449
+- Performance: Use `compare_by_identity` on some runtime caches
+- Properly support nested queries (fix `Thread.current` clash) #4445
+
 # 2.0.21 (11 April 2023)
 
 ### Deprecations

diff --git a/gemfiles/rails_4.2.gemfile b/gemfiles/rails_4.2.gemfile
@@ -7,6 +7,7 @@ gem "ruby-prof", platform: :ruby
 gem "pry"
 gem "pry-stack_explorer", platform: :ruby
 gem "rails", "~> 4.2", require: "rails/all"
+gem 'loofah', '~>2.19.1' # Trying to fix Nokogiri incompatibility
 gem "activerecord", "~> 4.2.4"
 gem "actionpack", "~> 4.2.4"
 gem "concurrent-ruby", "~> 1.0"

diff --git a/guides/authorization/visibility.md b/guides/authorization/visibility.md
@@ -93,3 +93,17 @@ end
 ```
 
 For this to work, the base argument class must be {% internal_link "configured with other GraphQL types", "/type_definitions/extensions.html#customizing-arguments" %}.
+
+## Opting Out
+
+By default, GraphQL-Ruby always runs visibility checks. You can opt out of this by adding to your schema class:
+
+```ruby
+class MySchema < GraphQL::Schema
+  # ...
+  # Opt out of GraphQL-Ruby's visibility feature:
+  use GraphQL::Schema::AlwaysVisible
+end
+```
+
+For big schemas, this can be a worthwhile speed-up.