diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-27 06:08:58 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-27 06:08:58 +0300 |
| commit | 53e4185a6e266ac3ebb70663e9825c84b66f0b5e (patch) | |
| tree | f26610b2991bc68bf6d2c4c1f75ae95ba1d23950 /doc/development/approval_rules.md | |
| parent | 7ace0e99be20db28a517b9d464cb3363d26766c9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/approval_rules.md')
| -rw-r--r-- | doc/development/approval_rules.md | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/development/approval_rules.md b/doc/development/approval_rules.md index 7617f63b715..fe364cef189 100644 --- a/doc/development/approval_rules.md +++ b/doc/development/approval_rules.md @@ -44,8 +44,8 @@ erDiagram ### `Project` and `MergeRequest` `Project` and `MergeRequest` models are defined in `ee/app/models/ee/project.rb` -and `ee/app/models/ee/merge_request.rb`. They extend the non-EE versions since -approval rules is an EE only feature. Associations and other related stuff to +and `ee/app/models/ee/merge_request.rb`. They extend the non-EE versions, because +approval rules are an EE-only feature. Associations and other related stuff to merge request approvals are defined here. ### `ApprovalState` @@ -265,8 +265,8 @@ graph LR ApprovalWrappedRule --> Approval ``` -This flow gets initiated by the frontend component. The data returned will -then be used to display information on the MR widget. +This flow gets initiated by the frontend component. The data returned is +used to display information on the MR widget. ### Approving a merge request @@ -282,5 +282,5 @@ is executed instead. ## TODO -1. Add information related to other rule types (e.g. `code_owner` and `report_approver`). +1. Add information related to other rule types, such as `code_owner` and `report_approver`. 1. Add information about side effects of approving/unapproving merge request. |