diff options
author | Ash McKenzie <amckenzie@gitlab.com> | 2019-08-08 04:11:25 +0000 |
---|---|---|
committer | Ash McKenzie <amckenzie@gitlab.com> | 2019-08-08 04:11:25 +0000 |
commit | 4985f6e26d758e7d5e43c3525a4afe4a9459ce8e (patch) | |
tree | 281ef6d2b7a1071d8b139c95dbc6e2fb88c563d1 | |
parent | 031a2fdd31d9535e35d99afe974e661eb3e18b79 (diff) | |
parent | 3588d7eec2098f37798ce223a3f468695af1e18c (diff) | |
download | gitlab-ce-4985f6e26d758e7d5e43c3525a4afe4a9459ce8e.tar.gz |
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
-rw-r--r-- | doc/api/projects.md | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/doc/api/projects.md b/doc/api/projects.md index ba7e28c279b..a17a32ea9df 100644 --- a/doc/api/projects.md +++ b/doc/api/projects.md @@ -1676,18 +1676,20 @@ GET /projects/:id/push_rule "author_email_regex": "", "file_name_regex": "", "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 -the `commit_committer_check` parameter: +the `commit_committer_check` and `reject_unsigned_commits` parameters: ```json { "id": 1, "project_id": 3, - "commit_committer_check": false + "commit_committer_check": false, + "reject_unsigned_commits": false ... } ``` @@ -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)$` | | `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. | +| `reject_unsigned_commits` **(PREMIUM)** | boolean | no | Reject commit when it is not signed through GPG. | ### Edit project 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)$` | | `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. | +| `reject_unsigned_commits` **(PREMIUM)** | boolean | no | Reject commits when they are not GPG signed. | ### Delete project push rule |