Commit c3175cb4 authored by Amy Qualls's avatar Amy Qualls

Merge branch 'DarwinJS-cross-link-suggestions-information' into 'master'

Docs: Crosslink "suggestions" information

See merge request gitlab-org/gitlab!61370
parents a359e38c 1779b98e
...@@ -1238,7 +1238,7 @@ POST /projects/user/:user_id ...@@ -1238,7 +1238,7 @@ POST /projects/user/:user_id
| `show_default_award_emojis` | boolean | **{dotted-circle}** No | Show default award emojis. | | `show_default_award_emojis` | boolean | **{dotted-circle}** No | Show default award emojis. |
| `snippets_access_level` | string | **{dotted-circle}** No | One of `disabled`, `private`, or `enabled`. | | `snippets_access_level` | string | **{dotted-circle}** No | One of `disabled`, `private`, or `enabled`. |
| `snippets_enabled` | boolean | **{dotted-circle}** No | _(Deprecated)_ Enable snippets for this project. Use `snippets_access_level` instead. | | `snippets_enabled` | boolean | **{dotted-circle}** No | _(Deprecated)_ Enable snippets for this project. Use `snippets_access_level` instead. |
| `suggestion_commit_message` | string | **{dotted-circle}** No | The commit message used to apply merge request suggestions. | | `suggestion_commit_message` | string | **{dotted-circle}** No | The commit message used to apply merge request [suggestions](../user/project/merge_requests/reviews/suggestions.md). |
| `tag_list` | array | **{dotted-circle}** No | The list of tags for a project; put array of tags, that should be finally assigned to a project. | | `tag_list` | array | **{dotted-circle}** No | The list of tags for a project; put array of tags, that should be finally assigned to a project. |
| `template_name` | string | **{dotted-circle}** No | When used without `use_custom_template`, name of a [built-in project template](../user/project/working_with_projects.md#built-in-templates). When used with `use_custom_template`, name of a custom project template. | | `template_name` | string | **{dotted-circle}** No | When used without `use_custom_template`, name of a [built-in project template](../user/project/working_with_projects.md#built-in-templates). When used with `use_custom_template`, name of a custom project template. |
| `use_custom_template` **(PREMIUM)** | boolean | **{dotted-circle}** No | Use either custom [instance](../user/admin_area/custom_project_templates.md) or [group](../user/group/custom_project_templates.md) (with `group_with_project_templates_id`) project template. | | `use_custom_template` **(PREMIUM)** | boolean | **{dotted-circle}** No | Use either custom [instance](../user/admin_area/custom_project_templates.md) or [group](../user/group/custom_project_templates.md) (with `group_with_project_templates_id`) project template. |
......
...@@ -7,6 +7,8 @@ type: reference, api ...@@ -7,6 +7,8 @@ type: reference, api
# Suggest Changes API **(FREE)** # Suggest Changes API **(FREE)**
This page describes the API for [suggesting changes](../user/project/merge_requests/reviews/suggestions.md).
Every API call to suggestions must be authenticated. Every API call to suggestions must be authenticated.
## Applying suggestions ## Applying suggestions
......
...@@ -7,7 +7,8 @@ type: reference, howto ...@@ -7,7 +7,8 @@ type: reference, howto
# Threads **(FREE)** # Threads **(FREE)**
GitLab encourages communication through comments, threads, and suggestions. GitLab encourages communication through comments, threads, and
[code suggestions](../project/merge_requests/reviews/suggestions.md).
For example, you can create a comment in the following places: For example, you can create a comment in the following places:
...@@ -22,7 +23,9 @@ There are standard comments, and you also have the option to create a comment ...@@ -22,7 +23,9 @@ There are standard comments, and you also have the option to create a comment
in the form of a thread. A comment can also be [turned into a thread](#start-a-thread-by-replying-to-a-standard-comment) in the form of a thread. A comment can also be [turned into a thread](#start-a-thread-by-replying-to-a-standard-comment)
when it receives a reply. when it receives a reply.
The comment area supports [Markdown](../markdown.md) and [quick actions](../project/quick_actions.md). You can edit your own The comment area supports [Markdown](../markdown.md) and [quick actions](../project/quick_actions.md).
You can [suggest code changes](../project/merge_requests/reviews/suggestions.md) in your comment,
which the user can accept through the user interface. You can edit your own
comment at any time, and anyone with [Maintainer access level](../permissions.md) or comment at any time, and anyone with [Maintainer access level](../permissions.md) or
higher can also edit a comment made by someone else. higher can also edit a comment made by someone else.
......
...@@ -9,9 +9,9 @@ type: index, reference ...@@ -9,9 +9,9 @@ type: index, reference
[Merge requests](../index.md) are the primary method of making changes to files in a [Merge requests](../index.md) are the primary method of making changes to files in a
GitLab project. [Create and submit a merge request](../creating_merge_requests.md) GitLab project. [Create and submit a merge request](../creating_merge_requests.md)
to propose changes. Your team makes [suggestions](suggestions.md) and leaves to propose changes. Your team leaves [comments](../../../discussions/index.md), and
[comments](../../../discussions/index.md). When your work is reviewed, your team makes [code suggestions](suggestions.md) you can accept from the user interface.
members can choose to accept or reject it. When your work is reviewed, your team members can choose to accept or reject it.
## View merge requests ## View merge requests
......
...@@ -140,3 +140,7 @@ to your branch to address your reviewers' requests. ...@@ -140,3 +140,7 @@ to your branch to address your reviewers' requests.
WARNING: WARNING:
Suggestions applied from multiple authors creates a commit authored by the user applying the suggestions. Suggestions applied from multiple authors creates a commit authored by the user applying the suggestions.
## Related links
- [Suggestions API](../../../../api/suggestions.md)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment