summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-08-21 01:04:09 +0000
committerEvan Read <eread@gitlab.com>2019-08-21 01:04:09 +0000
commitd35788d74b473b5e75d407c4441597dfaff5e544 (patch)
tree267114027b3fbe5a2d1ca86bae6479453e8e3e6b
parent80c57bf6d13d6025a9568afb9cca36c279fac593 (diff)
parent44ca24f4f25c022904d3dc8641ddf1cf10fe8fae (diff)
downloadgitlab-ce-d35788d74b473b5e75d407c4441597dfaff5e544.tar.gz
Merge branch 'docs-fix-soft-deletion' into 'master'
Fix outdated references to soft deletion See merge request gitlab-org/gitlab-ce!31982
-rw-r--r--doc/api/boards.md2
-rw-r--r--doc/api/group_boards.md2
-rw-r--r--doc/api/issues.md2
-rw-r--r--doc/api/merge_requests.md2
4 files changed, 4 insertions, 4 deletions
diff --git a/doc/api/boards.md b/doc/api/boards.md
index 08ec1d832df..b848d7788cd 100644
--- a/doc/api/boards.md
+++ b/doc/api/boards.md
@@ -466,7 +466,7 @@ Example response:
## Delete a board list
-Only for admins and project owners. Soft deletes the board list in question.
+Only for admins and project owners. Deletes the board list in question.
```
DELETE /projects/:id/boards/:board_id/lists/:list_id
diff --git a/doc/api/group_boards.md b/doc/api/group_boards.md
index 4d10f83720b..99b522a7ae9 100644
--- a/doc/api/group_boards.md
+++ b/doc/api/group_boards.md
@@ -536,7 +536,7 @@ Example response:
## Delete a group issue board list
-Only for admins and group owners. Soft deletes the board list in question.
+Only for admins and group owners. Deletes the board list in question.
```
DELETE /groups/:id/boards/:board_id/lists/:list_id
diff --git a/doc/api/issues.md b/doc/api/issues.md
index 11c18ef94ba..4f2b4a966c9 100644
--- a/doc/api/issues.md
+++ b/doc/api/issues.md
@@ -788,7 +788,7 @@ the `weight` parameter:
## Delete an issue
-Only for admins and project owners. Soft deletes the issue in question.
+Only for admins and project owners. Deletes the issue in question.
```
DELETE /projects/:id/issues/:issue_iid
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md
index 1ade46efb1c..49ed4968b0d 100644
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -1127,7 +1127,7 @@ the `approvals_before_merge` parameter:
## Delete a merge request
-Only for admins and project owners. Soft deletes the merge request in question.
+Only for admins and project owners. Deletes the merge request in question.
```
DELETE /projects/:id/merge_requests/:merge_request_iid