Merge branch 'docs/edit-graphql' into 'master'

Edit GraphQL general availability text

See merge request gitlab-org/gitlab-ce!30541

2 files changed, 7 insertions, 6 deletions

diff --git a/doc/api/README.md b/doc/api/README.md
index 3ded230370c..b2bb55f2fcf 100644
--- a/doc/api/README.md
+++ b/doc/api/README.md
@@ -154,9 +154,10 @@ the `/Users` endpoint. The base URL is: `/api/scim/v2/groups/:group_path/Users/`
 
 ## Road to GraphQL
 
-Going forward, we will start on moving to
-[GraphQL](graphql/index.md) and deprecate the use of
-controller-specific endpoints. GraphQL has a number of benefits:
+[GraphQL](graphql/index.md) is available in GitLab, which will
+allow deprecation of controller-specific endpoints.
+
+GraphQL has a number of benefits:
 
 1. We avoid having to maintain two different APIs.
 1. Callers of the API can request only what they need.
diff --git a/doc/api/graphql/index.md b/doc/api/graphql/index.md
index db073321808..4e4b9418e47 100644
--- a/doc/api/graphql/index.md
+++ b/doc/api/graphql/index.md
@@ -1,6 +1,8 @@
 # GraphQL API
 
-> [Introduced][ce-19008] in GitLab 11.0.
+> - [Introduced][ce-19008] in GitLab 11.0 (enabled by feature flag `graphql`).
+> - [Always enabled](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/30444)
+  in GitLab 12.1.
 
 [GraphQL](https://graphql.org/) is a query language for APIs that
 allows clients to request exactly the data they need, making it
@@ -29,8 +31,6 @@ There are no plans to deprecate the REST API. To reduce the technical burden of
 supporting two APIs in parallel, they should share implementations as much as
 possible.
 
-As of the 12.1 release, GraphQL is always enabled.
-
 ## Available queries
 
 A first iteration of a GraphQL API includes the following queries