summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2019-08-22 12:16:00 +0000
committerSean McGivern <sean@gitlab.com>2019-08-22 12:16:00 +0000
commit842b4d4ab59f19f7311b7f39948e699a6924fd52 (patch)
tree23edc0c7f19fea261a7eb37e9ed659b20ccdb9bc /.gitignore
parente423a017a46bbcb7fa127ad866ee1d868e303c48 (diff)
parent0dcb9d21efc1db97765d82ee39a0f0905ba945ba (diff)
downloadgitlab-ce-842b4d4ab59f19f7311b7f39948e699a6924fd52.tar.gz
Merge branch 'feat/smime-signed-notification-emails' into 'master'
feat: smime signed notification emails See merge request gitlab-org/gitlab-ce!30644
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index cb718a6939f..104c6930050 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,6 +75,8 @@ eslint-report.html
/.rspec
/plugins/*
/.gitlab_pages_secret
+/.gitlab_smime_key
+/.gitlab_smime_cert
package-lock.json
/junit_*.xml
/coverage-frontend/