diff options
author | Ashley Dumaine <adumaine@datto.com> | 2017-09-02 01:39:22 +0300 |
---|---|---|
committer | Sean McGivern <sean@gitlab.com> | 2017-09-06 12:07:47 +0300 |
commit | a3f76b76a4b8db85c6fa557a5e801dcea7195735 (patch) | |
tree | 730f99b9e673ed511a41113cd713ed39702c839f /doc | |
parent | 959e6d221d6b11c64d17fc9d4734200806c293ab (diff) |
change collapse to resolve and comments to discussions
Diffstat (limited to 'doc')
-rw-r--r-- | doc/api/projects.md | 24 | ||||
-rw-r--r-- | doc/user/discussions/img/automatically_collapse_outdated_diff_comments_regardless_of_discussion_resolution.png | bin | 129633 -> 0 bytes | |||
-rw-r--r-- | doc/user/discussions/img/automatically_resolve_outdated_diff_discussions.png | bin | 0 -> 107568 bytes | |||
-rw-r--r-- | doc/user/discussions/index.md | 11 |
4 files changed, 17 insertions, 18 deletions
diff --git a/doc/api/projects.md b/doc/api/projects.md index 345b88daa79..2d973547d14 100644 --- a/doc/api/projects.md +++ b/doc/api/projects.md @@ -70,7 +70,7 @@ Parameters: "jobs_enabled": true, "wiki_enabled": true, "snippets_enabled": false, - "collapse_outdated_diff_comments": false, + "resolve_outdated_diff_discussions": false, "container_registry_enabled": false, "created_at": "2013-09-30T13:46:02Z", "last_activity_at": "2013-09-30T13:46:02Z", @@ -138,7 +138,7 @@ Parameters: "jobs_enabled": true, "wiki_enabled": true, "snippets_enabled": false, - "collapse_outdated_diff_comments": false, + "resolve_outdated_diff_discussions": false, "container_registry_enabled": false, "created_at": "2013-09-30T13:46:02Z", "last_activity_at": "2013-09-30T13:46:02Z", @@ -248,7 +248,7 @@ Parameters: "jobs_enabled": true, "wiki_enabled": true, "snippets_enabled": false, - "collapse_outdated_diff_comments": false, + "resolve_outdated_diff_discussions": false, "container_registry_enabled": false, "created_at": "2013-09-30T13:46:02Z", "last_activity_at": "2013-09-30T13:46:02Z", @@ -316,7 +316,7 @@ Parameters: "jobs_enabled": true, "wiki_enabled": true, "snippets_enabled": false, - "collapse_outdated_diff_comments": false, + "resolve_outdated_diff_discussions": false, "container_registry_enabled": false, "created_at": "2013-09-30T13:46:02Z", "last_activity_at": "2013-09-30T13:46:02Z", @@ -415,7 +415,7 @@ Parameters: "jobs_enabled": true, "wiki_enabled": true, "snippets_enabled": false, - "collapse_outdated_diff_comments": false, + "resolve_outdated_diff_discussions": false, "container_registry_enabled": false, "created_at": "2013-09-30T13:46:02Z", "last_activity_at": "2013-09-30T13:46:02Z", @@ -542,7 +542,7 @@ Parameters: | `jobs_enabled` | boolean | no | Enable jobs for this project | | `wiki_enabled` | boolean | no | Enable wiki for this project | | `snippets_enabled` | boolean | no | Enable snippets for this project | -| `collapse_outdated_diff_comments` | boolean | no | Collapse outdated diffs regardless of discussion resolution | +| `resolve_outdated_diff_discussions` | boolean | no | Automatically resolve merge request diffs discussions on lines changed with a push | | `container_registry_enabled` | boolean | no | Enable container registry for this project | | `shared_runners_enabled` | boolean | no | Enable shared runners for this project | | `visibility` | string | no | See [project visibility level](#project-visibility-level) | @@ -580,7 +580,7 @@ Parameters: | `jobs_enabled` | boolean | no | Enable jobs for this project | | `wiki_enabled` | boolean | no | Enable wiki for this project | | `snippets_enabled` | boolean | no | Enable snippets for this project | -| `collapse_outdated_diff_comments` | boolean | no | Collapse outdated diffs regardless of discussion resolution | +| `resolve_outdated_diff_discussions` | boolean | no | Automatically resolve merge request diffs discussions on lines changed with a push | | `container_registry_enabled` | boolean | no | Enable container registry for this project | | `shared_runners_enabled` | boolean | no | Enable shared runners for this project | | `visibility` | string | no | See [project visibility level](#project-visibility-level) | @@ -617,7 +617,7 @@ Parameters: | `jobs_enabled` | boolean | no | Enable jobs for this project | | `wiki_enabled` | boolean | no | Enable wiki for this project | | `snippets_enabled` | boolean | no | Enable snippets for this project | -| `collapse_outdated_diff_comments` | boolean | no | Collapse outdated diffs regardless of discussion resolution | +| `resolve_outdated_diff_discussions` | boolean | no | Automatically resolve merge request diffs discussions on lines changed with a push | | `container_registry_enabled` | boolean | no | Enable container registry for this project | | `shared_runners_enabled` | boolean | no | Enable shared runners for this project | | `visibility` | string | no | See [project visibility level](#project-visibility-level) | @@ -691,7 +691,7 @@ Example response: "jobs_enabled": true, "wiki_enabled": true, "snippets_enabled": false, - "collapse_outdated_diff_comments": false, + "resolve_outdated_diff_discussions": false, "container_registry_enabled": false, "created_at": "2013-09-30T13:46:02Z", "last_activity_at": "2013-09-30T13:46:02Z", @@ -767,7 +767,7 @@ Example response: "jobs_enabled": true, "wiki_enabled": true, "snippets_enabled": false, - "collapse_outdated_diff_comments": false, + "resolve_outdated_diff_discussions": false, "container_registry_enabled": false, "created_at": "2013-09-30T13:46:02Z", "last_activity_at": "2013-09-30T13:46:02Z", @@ -849,7 +849,7 @@ Example response: "jobs_enabled": true, "wiki_enabled": true, "snippets_enabled": false, - "collapse_outdated_diff_comments": false, + "resolve_outdated_diff_discussions": false, "container_registry_enabled": false, "created_at": "2013-09-30T13:46:02Z", "last_activity_at": "2013-09-30T13:46:02Z", @@ -943,7 +943,7 @@ Example response: "jobs_enabled": true, "wiki_enabled": true, "snippets_enabled": false, - "collapse_outdated_diff_comments": false, + "resolve_outdated_diff_discussions": false, "container_registry_enabled": false, "created_at": "2013-09-30T13:46:02Z", "last_activity_at": "2013-09-30T13:46:02Z", diff --git a/doc/user/discussions/img/automatically_collapse_outdated_diff_comments_regardless_of_discussion_resolution.png b/doc/user/discussions/img/automatically_collapse_outdated_diff_comments_regardless_of_discussion_resolution.png Binary files differdeleted file mode 100644 index 4c273637bfc..00000000000 --- a/doc/user/discussions/img/automatically_collapse_outdated_diff_comments_regardless_of_discussion_resolution.png +++ /dev/null diff --git a/doc/user/discussions/img/automatically_resolve_outdated_diff_discussions.png b/doc/user/discussions/img/automatically_resolve_outdated_diff_discussions.png Binary files differnew file mode 100644 index 00000000000..500c24ee175 --- /dev/null +++ b/doc/user/discussions/img/automatically_resolve_outdated_diff_discussions.png diff --git a/doc/user/discussions/index.md b/doc/user/discussions/index.md index 5771b420fdf..b2264c15d63 100644 --- a/doc/user/discussions/index.md +++ b/doc/user/discussions/index.md @@ -116,18 +116,17 @@ are resolved. ![Only allow merge if all the discussions are resolved message](img/only_allow_merge_if_all_discussions_are_resolved_msg.png) -### Automatically collapse outdated diff comments regardless of discussion resolution +### Automatically resolve merge request diffs discussions on lines changed with a push -You can automatically collapse comments on outdated diffs regardless of whether -the discussion is resolved. +You can automatically resolve merge request diff discussions on lines modified with a new commit. Navigate to your project's settings page, select the -**Collapse outdated diffs regardless of discussion resolution** check box and hit +**Automatically resolve merge request diffs discussions on lines changed with a push** check box and hit **Save** for the changes to take effect. -![Automatically collapse outdated diff comments regardless of discussion resolution](img/automatically_collapse_outdated_diff_comments_regardless_of_discussion_resolution.png) +![Automatically resolve merge request diffs discussions on lines changed with a push](img/automatically_resolve_outdated_diff_discussions.png) -From now on, any discussions on an outdated diff will be collapsed by default. +From now on, any discussions on an outdated diff will be resolved by default. ## Threaded discussions |