Add latest changes from gitlab-org/gitlab@master

2 files changed, 23 insertions, 0 deletions

diff --git a/doc/raketasks/README.md b/doc/raketasks/README.md
index 8faace58599..1670849016c 100644
--- a/doc/raketasks/README.md
+++ b/doc/raketasks/README.md
@@ -36,3 +36,4 @@ The following are available Rake tasks:
 | [Uploads sanitize](../administration/raketasks/uploads/sanitize.md)                        | Remove EXIF data from images uploaded to earlier versions of GitLab.                      |
 | [User management](user_management.md)                                                      | Perform user management tasks.                                                            |
 | [Webhooks administration](web_hooks.md)                                                    | Maintain project Webhooks.                                                                |
+| [X509 signatures](x509_signatures.md)                                                      | Update x509 commit signatures, useful if certificate store has changed.                   |
diff --git a/doc/raketasks/x509_signatures.md b/doc/raketasks/x509_signatures.md
new file mode 100644
index 00000000000..dd518997f7b
--- /dev/null
+++ b/doc/raketasks/x509_signatures.md
@@ -0,0 +1,22 @@
+# X509 signatures
+
+When [signing commits with x509](../user/project/repository/x509_signed_commits/index.md)
+the trust anchor might change and the signatures stored within the database have
+to be updated.
+
+## Update all x509 signatures
+
+This task loops through all X509 signed commits and updates their verification
+based on current certificate store.
+
+**Omnibus Installation**
+
+```shell
+sudo gitlab-rake gitlab:x509:update_signatures
+```
+
+**Source Installation**
+
+```shell
+sudo -u git -H bundle exec rake gitlab:x509:update_signatures RAILS_ENV=production
+```