Merge branch 'master' into bypass-warden

Author: rmosolgo

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

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

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

benchmark/run.rb

@@ -132,12 +132,13 @@ def self.profile
   def self.profile_large_introspection
     schema = SILLY_LARGE_SCHEMA
     Benchmark.ips do |x|
+      x.config(time: 10)
       x.report("Run large introspection") {
         schema.to_json
       }
     end
 
-    result = StackProf.run(mode: :wall, interval: 10) do
+    result = StackProf.run(mode: :wall) do
       schema.to_json
     end
     StackProf::Report.new(result).print_text
@@ -204,6 +205,7 @@ def self.profile_large_result
     schema = ProfileLargeResult::Schema
     document = ProfileLargeResult::ALL_FIELDS
     Benchmark.ips do |x|
+      x.config(time: 10)
       x.report("Querying for #{ProfileLargeResult::DATA.size} objects") {
         schema.execute(document: document)
       }

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"

graphql-c_parser/CHANGELOG.md

@@ -1,5 +1,14 @@
 # GraphQL::CParser
 
+
+## 1.0.2
+
+- Remove `.y` and `.rl` files to avoid triggering build tasks during install
+
+## 1.0.1
+
+- Fix gem files (to include `ext`)
+
 ## 1.0.0
 
 - Release GraphQL::CParser

graphql-c_parser/Rakefile

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+require "bundler/gem_helper"
+
+# use a custom tag to avoid conflicting with GraphQL-Ruby tags in the same git repo
+class CustomGemHelper < Bundler::GemHelper
+  def version_tag
+    "graphql-c_parser-v#{version}"
+  end
+end
+CustomGemHelper.install_tasks

graphql-c_parser/graphql-c_parser.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
     "mailing_list_uri"  => "https://tinyletter.com/graphql-ruby",
   }
 
-  s.files = Dir["{lib}/**/*"]
+  s.files = Dir["{lib,ext}/**/*.{rb,h,c}"]
   s.extensions << "ext/graphql_c_parser_ext/extconf.rb"
   s.add_dependency "graphql"
 end

graphql-c_parser/lib/graphql/c_parser/version.rb

@@ -2,6 +2,6 @@
 
 module GraphQL
   module CParser
-    VERSION = "1.0.0"
+    VERSION = "1.0.2"
   end
 end

guides/authorization/pundit_integration.md

@@ -411,11 +411,11 @@ Here's an example of how the custom hooks can be installed:
 ```ruby
 module CustomPolicyLookup
   # Lookup policies in the `SystemAdmin::` namespace for system_admin users
+  # @return [Class]
   def pundit_policy_class_for(object, context)
     current_user = context[:current_user]
     if current_user.system_admin?
-      policy_class = SystemAdmin.const_get("#{object.class.name}Policy")
-      policy_class.new(current_user, object)
+      SystemAdmin.const_get("#{object.class.name}Policy")
     else
       super
     end