Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Follow up to: "Add new "Delete Changes" permission"

Change-Id: Id35556ad7a8dd8287b92b080cff8330ba4db8c4f
This commit is contained in:
David Pursehouse
2018-07-19 10:14:00 +09:00

View File

@@ -138,6 +138,7 @@ permissionNames = \
createTag, \ createTag, \
createSignedTag, \ createSignedTag, \
delete, \ delete, \
deleteChanges, \
deleteOwnChanges, \ deleteOwnChanges, \
editAssignee, \ editAssignee, \
editHashtags, \ editHashtags, \
@@ -161,6 +162,7 @@ create = Create Reference
createTag = Create Annotated Tag createTag = Create Annotated Tag
createSignedTag = Create Signed Tag createSignedTag = Create Signed Tag
delete = Delete Reference delete = Delete Reference
deleteChanges = Delete Changes
deleteOwnChanges = Delete Own Changes deleteOwnChanges = Delete Own Changes
editAssignee = Edit Assignee editAssignee = Edit Assignee
editHashtags = Edit Hashtags editHashtags = Edit Hashtags