Commit 4985f6e2 authored by Ash McKenzie's avatar Ash McKenzie

Merge branch 'tpresa-expose-reject-unsigned-commits' into 'master'

Add docs for reject_unsigned_commits (premium only)

See merge request gitlab-org/gitlab-ce!31113
parents 031a2fdd 3588d7ee
...@@ -1676,18 +1676,20 @@ GET /projects/:id/push_rule ...@@ -1676,18 +1676,20 @@ GET /projects/:id/push_rule
"author_email_regex": "", "author_email_regex": "",
"file_name_regex": "", "file_name_regex": "",
"max_file_size": 5, "max_file_size": 5,
"commit_committer_check": false "commit_committer_check": false,
"reject_unsigned_commits": false
} }
``` ```
Users on GitLab [Premium, Silver, or higher](https://about.gitlab.com/pricing/) will also see Users on GitLab [Premium, Silver, or higher](https://about.gitlab.com/pricing/) will also see
the `commit_committer_check` parameter: the `commit_committer_check` and `reject_unsigned_commits` parameters:
```json ```json
{ {
"id": 1, "id": 1,
"project_id": 3, "project_id": 3,
"commit_committer_check": false "commit_committer_check": false,
"reject_unsigned_commits": false
... ...
} }
``` ```
...@@ -1713,6 +1715,7 @@ POST /projects/:id/push_rule ...@@ -1713,6 +1715,7 @@ POST /projects/:id/push_rule
| `file_name_regex` **(STARTER)** | string | no | All commited filenames must **not** match this, e.g. `(jar|exe)$` | | `file_name_regex` **(STARTER)** | string | no | All commited filenames must **not** match this, e.g. `(jar|exe)$` |
| `max_file_size` **(STARTER)** | integer | no | Maximum file size (MB) | | `max_file_size` **(STARTER)** | integer | no | Maximum file size (MB) |
| `commit_committer_check` **(PREMIUM)** | boolean | no | Users can only push commits to this repository that were committed with one of their own verified emails. | | `commit_committer_check` **(PREMIUM)** | boolean | no | Users can only push commits to this repository that were committed with one of their own verified emails. |
| `reject_unsigned_commits` **(PREMIUM)** | boolean | no | Reject commit when it is not signed through GPG. |
### Edit project push rule ### Edit project push rule
...@@ -1735,6 +1738,7 @@ PUT /projects/:id/push_rule ...@@ -1735,6 +1738,7 @@ PUT /projects/:id/push_rule
| `file_name_regex` **(STARTER)** | string | no | All commited filenames must **not** match this, e.g. `(jar|exe)$` | | `file_name_regex` **(STARTER)** | string | no | All commited filenames must **not** match this, e.g. `(jar|exe)$` |
| `max_file_size` **(STARTER)** | integer | no | Maximum file size (MB) | | `max_file_size` **(STARTER)** | integer | no | Maximum file size (MB) |
| `commit_committer_check` **(PREMIUM)** | boolean | no | Users can only push commits to this repository that were committed with one of their own verified emails. | | `commit_committer_check` **(PREMIUM)** | boolean | no | Users can only push commits to this repository that were committed with one of their own verified emails. |
| `reject_unsigned_commits` **(PREMIUM)** | boolean | no | Reject commits when they are not GPG signed. |
### Delete project push rule ### Delete project push rule
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment