Revert "Merge branch 'master' into 1.9-dev"

This reverts commit 5d71dc2, reversing
changes made to e6b4695.

Author: rmosolgo

CHANGELOG-pro.md

@@ -8,18 +8,6 @@
 
 ### Bug Fix
 
-## 1.7.12 (29 Aug 2018)
-
-### New Features
-
-- Add `GraphQL::Pro::CanCanIntegration` which leverages GraphQL-Ruby's built-in auth
-
-## 1.7.11 (21 Aug 2018)
-
-### Bug Fix
-
-- `PunditIntegration`: Don't try to authorize loaded objects when they're `nil`
-
 ## 1.7.10 (10 Aug 2018)
 
 ### New Features

CHANGELOG.md

@@ -8,21 +8,6 @@
 
 ### Bug fixes
 
-## 1.8.8 (27 Aug 2018)
-
-### Bug fixes
-
-- When using `RelayClassicMutation`, `client_mutation_id` will no longer be passed to `authorized?` method #1771
-- Fix issue in schema upgrader script which would cause `.to_non_null_type` calls in type definition to be ignored #1783
-- Ensure enum values respond to `graphql_name` #1792
-- Fix infinite resolution bug that could occur when an exception not inheriting from `StandardError` is thrown #1804
-
-### New features
-
-- Add `#path` method to schema members #1766
-- Add `as:` argument to allow overriding the name of the argument when using `loads:` #1773
-- Add support for list of IDs when using `loads:` in an argument definition #1797
-
 ## 1.8.7 (9 Aug 2018)
 
 ### Breaking changes

guides/authorization/can_can_integration.md

@@ -135,4 +135,4 @@ To accomplish these, you can use GraphQL-Ruby's authorization framework. The fra
 - {% internal_link "Accessibility", "/authorization/accessibility" %} prevents running queries which access parts of the GraphQL schema, unless users have the required permission.
 - {% internal_link "Authorization", "/authorization/authorization" %} checks application objects during execution to be sure the user has permission to access them.
 
-Also, [GraphQL::Pro](http://graphql.pro) has integrations for {% internal_link "CanCan", "/authorization/can_can_integration" %} and {% internal_link "Pundit", "/authorization/pundit_integration" %}.
+Also, [GraphQL::Pro](http://graphql.pro) has integrations for CanCan and {% internal_link "Pundit", "/authorization/pundit_integration" %}.

guides/authorization/overview.md

@@ -197,7 +197,7 @@ Then, make sure your base argument is hooked up to your base field and base inpu
 ```ruby
 class Types::BaseField < GraphQL::Schema::Field
   argument_class Types::BaseArgument
-  # PS: see "Authorizing Fields" to make sure your base field is hooked up to objects, interfaces and mutations
+  # PS: see "Authorizing Fields" to make sure your base field is hooked up to objects, intefaces and mutations
 end
 
 class Types::BaseInputObject < GraphQL::Schema::InputObject
@@ -232,11 +232,8 @@ Also, you can configure [unauthorized object handling](#unauthorized-mutations)
 Add `MutationIntegration` to your base mutation, for example:
 
 ```ruby
-class Mutations::BaseMutation < GraphQL::Schema::Mutation
-  include GraphQL::Pro::PunditIntegration::MutationIntegration
-
-  # Also, to use argument-level authorization:
-  argument_class Types::BaseArgument
+class Mutations::BaseMutation < GraphQL::Schema::RelayClassicMutation
+  include GraphQL::Pro::PunditIntegration
 end
 ```