summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-11-22 11:16:11 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-11-22 11:16:11 +0000
commitd6603493ea6ef347a5193c6df186c4576ca887b2 (patch)
treef6e45fc6884412ad75bc16bb98c9e3178d19247e
parent38f8ad41f9e9459c9af57cf71484acd34133cfe5 (diff)
parent4a411f2711be742b41dc347a0fa876bd9576a0ab (diff)
downloadgitlab-ce-d6603493ea6ef347a5193c6df186c4576ca887b2.tar.gz
Merge branch 'ux-guide-update-mr-copy' into 'master'
Add Approve and Remove approval to UX Guide terminology table Updating UX Guide page on terminology to include guidance on 'Approve' and 'Remove approval'. See merge request !7632
-rw-r--r--doc/development/ux_guide/copy.md4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/development/ux_guide/copy.md b/doc/development/ux_guide/copy.md
index 227b4fd3451..b557fb47120 100644
--- a/doc/development/ux_guide/copy.md
+++ b/doc/development/ux_guide/copy.md
@@ -96,4 +96,6 @@ The form should be titled `Edit issue`. The submit button should be labeled `Sav
| Add | Add a merge request | Do not use `create` or `new` |
| View | View an open or merged merge request ||
| Edit | Edit an open or merged merge request| Do not use `update` |
-| Merge | Merge an open merge request || \ No newline at end of file
+| Approve | Approve an open merge request ||
+| Remove approval, unapproved | Remove approval of an open merge request | Do not use `unapprove` as that is not an English word|
+| Merge | Merge an open merge request ||