summaryrefslogtreecommitdiff
path: root/doc/security
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-19 09:09:27 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-19 09:09:27 +0000
commit2af90cef2e2e9c776eae4394a43dba3be7f33d1e (patch)
treebb4bc691caa6cc74b45720ecd779517f9c8c2cd3 /doc/security
parentcf58004721ee715dd3884476f6fa0c62a7e7f247 (diff)
downloadgitlab-ce-2af90cef2e2e9c776eae4394a43dba3be7f33d1e.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/security')
-rw-r--r--doc/security/README.md1
-rw-r--r--doc/security/cicd_environment_variables.md11
2 files changed, 12 insertions, 0 deletions
diff --git a/doc/security/README.md b/doc/security/README.md
index 20da1a2c77c..c21d99658b8 100644
--- a/doc/security/README.md
+++ b/doc/security/README.md
@@ -19,6 +19,7 @@ type: index
- [Send email confirmation on sign-up](user_email_confirmation.md)
- [Security of running jobs](https://docs.gitlab.com/runner/security/)
- [Proxying images](asset_proxy.md)
+- [CI/CD environment variables](cicd_environment_variables.md)
## Securing your GitLab installation
diff --git a/doc/security/cicd_environment_variables.md b/doc/security/cicd_environment_variables.md
new file mode 100644
index 00000000000..ea597ea05f2
--- /dev/null
+++ b/doc/security/cicd_environment_variables.md
@@ -0,0 +1,11 @@
+---
+type: reference
+---
+
+# CI/CD Environment Variables
+
+Environment variables are applied to environments via the runner and can be set from the project's **Settings > CI/CD** page.
+
+The values are encrypted using [aes-256-cbc](https://en.wikipedia.org/wiki/Advanced_Encryption_Standard) and stored in the database.
+
+This data can only be decrypted with a valid [secrets file](../raketasks/backup_restore.md#when-the-secrets-file-is-lost).