Merge branch 'master' into feature/argument-deprecation

# Conflicts:
#	spec/graphql/schema/argument_spec.rb

Author: jturkel

CHANGELOG.md

@@ -8,6 +8,42 @@
 
 ### Bug fixes
 
+## 1.11.4 (24 August 2020)
+
+### Breaking changes
+
+### New features
+
+- Add `node_nullable` option for `edge_type` #3083
+- Use module namespacing for template generators #3098
+
+### Bug fixes
+
+- Rescue `SystemStackError`s during validation #3107
+- Add `require 'digest/sha2'` for fingerprint #3103
+- Optimize `GraphQL::Query::Context#dig` #3090
+- Check if new connections before calling method on it (fixes #3059) #3100
+- Thread field owner type through interpreter runtime (fixes #3086) #3099
+- Check for visible interfaces on the type in warden #3096
+- Update `AppOpticsTracing` with latest changes in `PlatformTracing` #3097
+- Use throw instead of raise to halt subscriptions early #3084
+- Optimize `GraphQL::Query::Context#fetch` #3081
+
+## 1.11.3 (13 August 2020)
+
+### Breaking changes
+
+- Reverted the `required` and `default_value` argument behaviour change in 1.11.2 since it was not spec compliant #3066
+
+### New features
+
+- Improve resolver method conflict warning #3069, #3062
+- Store arguments on `Mutation` instances after they're loaded #3073
+
+### Bug fixes
+
+- Fix connection wrappers on lazy lists #3070
+
 ## 1.11.2 (1 August 2020)
 
 ### Breaking changes

guides/fields/introduction.md

@@ -52,7 +52,7 @@ field :scores, [Integer, null: true], null: true # `[Int]`, may return a list or
 
 ### Field Documentation
 
-Fields maybe documented with a __description__ and may be __deprecated__.
+Fields may be documented with a __description__ and may be __deprecated__.
 
 __Descriptions__ can be added with the `field(...)` method as a positional argument, a keyword argument, or inside the block:
 

guides/related_projects.md

@@ -16,6 +16,7 @@ Want to add something? Please open a pull request [on GitHub](https://github.com
 - [`graphql-batch`](https://github.com/shopify/graphql-batch), a batched query execution strategy
 - [`graphql-cache`](https://github.com/stackshareio/graphql-cache), a resolver-level caching solution
 - [`graphql-libgraphqlparser`](https://github.com/rmosolgo/graphql-libgraphqlparser-ruby), bindings to [libgraphqlparser](https://github.com/graphql/libgraphqlparser), a C-level parser.
+- [`graphql-devise`](https://github.com/graphql-devise/graphql_devise), a gql interface to handle authentication with Devise
 - [`graphql-docs`](https://github.com/gjtorikian/graphql-docs), a tool to automatically generate static HTML documentation from your GraphQL implementation
 - [`graphql-metrics`](https://github.com/Shopify/graphql-metrics), a plugin to extract fine-grain metrics of GraphQL queries received by your server
 - [`graphql-groups`](https://github.com/hschne/graphql-groups), a DSL to define group- and aggregation queries with graphql-ruby

guides/relay/connections.md

@@ -89,8 +89,6 @@ class Types::PostConnectionWithTotalCountType < GraphQL::Types::Relay::BaseConne
 end
 ```
 
-__Note:__  If you use _classes_ for an object's connection or edge types, then all of that object's connection and edge types should be classes. Otherwise, the auto-generated types from the `.edge_type` or `.connection_type` helpers will conflict with the class-based types.
-
 Now, you can use `PostConnectionWithTotalCountType` to define a connection with the "totalCount" field:
 
 ```ruby

guides/subscriptions/ably_implementation.md

@@ -184,10 +184,11 @@ end
 4. Click on the "+ New Reactor Rule" button
 5. Click on the "Choose" button for "Reactor Event"
 6. Click on the "Choose" button for "WebHooks"
-7. Enter your url (including the webhooks path from above) in the URL field
-8. Under "Source" select "Channel Lifecycle"
-9. Under "Sign with key" select the API Key prefix that matches the prefix of the ABLY_API_KEY you provided.
-10. Click "Create"
+7. Enter your url (including the webhooks path from above) in the URL field.
+8. Select "Batch request" for "Request Mode"
+9. Under "Source" select "Channel Lifecycle"
+10. Under "Sign with key" select the API Key prefix that matches the prefix of the ABLY_API_KEY you provided.
+11. Click "Create"
 
 ## Authorization
 

guides/type_definitions/interfaces.md

@@ -120,7 +120,7 @@ end
 
 Those object types will _inherit_ field definitions from those interfaces.
 
-If you add an object type which implements an interface, but that object type doesn't properly appear in your schema, then you need to add that object to the interfaces's `orphan_types`.
+If you add an object type which implements an interface, but that object type doesn't appear in your schema as a field return type, a union member, or a root type, then you need to add that object to the interfaces's `orphan_types`.
 
 ### Implementing Fields
 

lib/generators/graphql/core.rb

@@ -41,6 +41,14 @@ def create_dir(dir)
         end
       end
 
+      def module_namespacing_when_supported
+        if defined?(module_namespacing)
+          module_namespacing { yield }
+        else
+          yield
+        end
+      end
+
       private
 
       def schema_name

lib/generators/graphql/templates/base_argument.erb

@@ -1,4 +1,6 @@
+<% module_namespacing_when_supported do -%>
 module Types
   class BaseArgument < GraphQL::Schema::Argument
   end
 end
+<% end -%>

lib/generators/graphql/templates/base_enum.erb

@@ -1,4 +1,6 @@
+<% module_namespacing_when_supported do -%>
 module Types
   class BaseEnum < GraphQL::Schema::Enum
   end
 end
+<% end -%>

lib/generators/graphql/templates/base_field.erb

@@ -1,5 +1,7 @@
+<% module_namespacing_when_supported do -%>
 module Types
   class BaseField < GraphQL::Schema::Field
     argument_class Types::BaseArgument
   end
 end
+<% end -%>