Automatic merge of gitlab-org/gitlab-ce master

app/assets/javascripts/batch_comments/mixins/resolved_status.js

 export default {
   computed: {
     resolveButtonTitle() {
-      let title = 'Mark as resolved';
+      let title = 'Mark comment as resolved';
 
       if (this.resolvedBy) {
         title = `Resolved by ${this.resolvedBy.name}`;

changelogs/unreleased/mark-comment-resolved.yml

+---
+title: Change resolve button text to mark comment as resolved
+merge_request:
+author:
+type: fixed

doc/api/README.md

@@ -204,6 +204,8 @@ curl "https://gitlab.example.com/api/v4/projects"
 The API uses JSON to serialize data. You don't need to specify `.json` at the
 end of an API URL.
 
+All of the API endpoints that use the `POST`, `PUT` or `PATCH` method support params in the request body, with `Content-Type` `application/x-www-form-urlencoded`, `multipart/form-data` or `application/json`.
+
 ## Authentication
 
 Most API requests require authentication, or will only return public data when

doc/api/graphql/index.md

@@ -16,6 +16,20 @@ added to the API without creating breaking changes. This allows us to
 have a versionless API as described in [the GraphQL
 documentation](https://graphql.org/learn/best-practices/#versioning).
 
+## Vision
+
+We want the GraphQL API to be the **primary** means of interacting
+programmatically with GitLab. To achieve this, it needs full coverage - anything
+possible in the REST API should also be possible in the GraphQL API.
+
+To help us meet this vision, the frontend should use GraphQL in preference to
+the REST API for new features, although the alpha status of GraphQL may prevent
+this from being a possibility at times.
+
+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.
+
 ## Enabling the GraphQL feature
 
 The GraphQL API itself is currently in Alpha, and therefore hidden behind a
@@ -32,7 +46,6 @@ curl --data "value=100" --header "PRIVATE-TOKEN: <your_access_token>" https://gi
 A first iteration of a GraphQL API includes the following queries
 
 1. `project` : Within a project it is also possible to fetch a `mergeRequest` by IID.
-
 1. `group` : Only basic group information is currently supported.
 
 ## GraphiQL

doc/user/project/merge_requests/index.md

@@ -547,13 +547,13 @@ Add the following alias to your `~/.gitconfig`:
 
 Now you can check out a particular merge request from any repository and any
 remote. For example, to check out the merge request with ID 5 as shown in GitLab
-from the `upstream` remote, do:
+from the `origin` remote, do:
 
 ```
-git mr upstream 5
+git mr origin 5
 ```
 
-This will fetch the merge request into a local `mr-upstream-5` branch and check
+This will fetch the merge request into a local `mr-origin-5` branch and check
 it out.
 
 #### Checkout locally by modifying `.git/config` for a given repository