Commit 10094950 authored by Evan Read's avatar Evan Read

Merge branch 'fix-permissions-in-docs-lock-discussions' into 'master'

Fix permissions in docs lock discussions

See merge request gitlab-org/gitlab-ce!25303
parents bcb1ab3e 36fe0b1a
...@@ -253,8 +253,9 @@ to newer issues or merge requests. ...@@ -253,8 +253,9 @@ to newer issues or merge requests.
- The people participating in the discussion are trolling, abusive, or otherwise - The people participating in the discussion are trolling, abusive, or otherwise
being unproductive. being unproductive.
In these cases, a user with Maintainer permissions or higher in the project can lock (and unlock) In these cases, a user with Developer permissions or higher in the project can lock (and unlock)
an issue or a merge request, using the "Lock" section in the sidebar: an issue or a merge request, using the "Lock" section in the sidebar. For issues,
a user with Reporter permissions can lock (and unlock).
| Unlock | Lock | | Unlock | Lock |
| :-----------: | :----------: | | :-----------: | :----------: |
......
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