Commit 239e2007 authored by Marcia Ramos's avatar Marcia Ramos

Merge branch 'fcatteau-master-patch-16854' into 'master'

Fix user doc image: Resolve all threads in new issue

See merge request gitlab-org/gitlab!51798
parents 67b670a8 8fc9cd08
...@@ -115,7 +115,7 @@ are resolved](#only-allow-merge-requests-to-be-merged-if-all-threads-are-resolve ...@@ -115,7 +115,7 @@ are resolved](#only-allow-merge-requests-to-be-merged-if-all-threads-are-resolve
there will be an **open an issue to resolve them later** link in the merge there will be an **open an issue to resolve them later** link in the merge
request widget. request widget.
![Link in merge request widget](img/resolve_thread_open_issue.png) ![Link in merge request widget](img/resolve_thread_open_issue_v13_9.png)
This will prepare an issue with its content referring to the merge request and This will prepare an issue with its content referring to the merge request and
the unresolved threads. the unresolved threads.
...@@ -161,7 +161,7 @@ box and hit **Save** for the changes to take effect. ...@@ -161,7 +161,7 @@ box and hit **Save** for the changes to take effect.
From now on, you will not be able to merge from the UI until all threads From now on, you will not be able to merge from the UI until all threads
are resolved. are resolved.
![Only allow merge if all the threads are resolved message](img/resolve_thread_open_issue.png) ![Only allow merge if all the threads are resolved message](img/resolve_thread_open_issue_v13_9.png)
### Automatically resolve merge request diff threads when they become outdated ### Automatically resolve merge request diff threads when they become outdated
......
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