summaryrefslogtreecommitdiff
path: root/doc/user/project/quick_actions.md
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2019-05-06 10:08:20 +0100
committerFilipa Lacerda <filipa@gitlab.com>2019-05-06 10:08:20 +0100
commit678c5a0086646b1efaed4c02bc53a018f6b0a950 (patch)
tree1d77242b1480020fe2170de19577500f79699c17 /doc/user/project/quick_actions.md
parent8d1bdaf4396291c7a61bcc3da8b0d6cd2da3e0dc (diff)
parent8b55b794cb48c726cde7cf0ad24180d8e6bb975f (diff)
downloadgitlab-ce-61278-next.tar.gz
Merge branch 'master' into 61278-next61278-next
* master: (64 commits) Allow usage of quick actions for internal users Added Omniauth OpenId Connect startegy Changelog update for MR #27025, Issue #57528 Docs: Realigning scattered EE docs into CE Add troubleshooting step for older docker clients Edit regionendpoint text Docs: Change geo redirects to relative to match EE Docs: Second Attempt to realign administration/geo docs Document Prometheus app can be uninstalled Docs: Merge EE doc/administration/high_availability to CE Docs: Merge EE doc/gitlab-geo to CE Docs: Merge EE doc/user/application_security to CE Docs: Merge EE doc/​administration/​geo to CE Docs: Merge Various EE /doc dirs to CE Docs: Merge EE doc/user/project/*.md to CE Docs: Merge 4 EE doc/user/project dirs to CE Docs: Merge misc EE doc/user/project/i* dirs to CE Docs: Merge Misc EE doc/administration files and dirs to CE Docs: Merge EE doc/ci to CE Docs: Merge EE doc/user/project/issues to CE ...
Diffstat (limited to 'doc/user/project/quick_actions.md')
-rw-r--r--doc/user/project/quick_actions.md4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/user/project/quick_actions.md b/doc/user/project/quick_actions.md
index 2040e2ee004..15eb862b431 100644
--- a/doc/user/project/quick_actions.md
+++ b/doc/user/project/quick_actions.md
@@ -46,13 +46,15 @@ discussions, and descriptions:
| `/remove_due_date` | Remove due date | ✓ | |
| `/weight 0,1,2, ...` | Set weight **[STARTER]** | ✓ | |
| `/clear_weight` | Clears weight **[STARTER]** | ✓ | |
-| `/epic <group&epic &#124; Epic URL>` | Add to epic **[ULTIMATE]** | ✓ | |
+| `/epic <&epic &#124; group&epic &#124; Epic URL>` | Add to epic **[ULTIMATE]** | ✓ | |
| `/remove_epic` | Removes from epic **[ULTIMATE]** | ✓ | |
+| `/promote` | Promote issue to epic **[ULTIMATE]** | ✓ | |
| `/confidential` | Make confidential | ✓ | |
| `/duplicate #issue` | Mark this issue as a duplicate of another issue | ✓ |
| `/move path/to/project` | Move this issue to another project | ✓ | |
| `/target_branch <Local branch Name>` | Set target branch | | ✓ |
| `/wip` | Toggle the Work In Progress status | | ✓ |
+| `/approve` | Approve the merge request | | ✓ |
| `/merge` | Merge (when pipeline succeeds) | | ✓ |
| `/create_merge_request <branch name>` | Create a new merge request starting from the current issue | ✓ | |