diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-12-07 14:43:25 +0300 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2018-12-17 18:11:35 +0300 |
| commit | 1b7a8b47f5844d07644ab2fe6239fc45d666d89a (patch) | |
| tree | 4f0f09d5dcd7f607606942c043969371f735a115 /lib | |
| parent | 28299e73c49bbbe618dc26690d97f3507e644e3a (diff) | |
Merge branch 'fix/gb/encrypt-ci-build-token' into 'master'
Add CI/CD build encrypted tokens (after revert)
Closes #52342
See merge request gitlab-org/gitlab-ce!23649
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/import_export/import_export.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml index fde8561c16c..d10d4f2f746 100644 --- a/lib/gitlab/import_export/import_export.yml +++ b/lib/gitlab/import_export/import_export.yml @@ -143,6 +143,7 @@ excluded_attributes: statuses: - :trace - :token + - :token_encrypted - :when - :artifacts_file - :artifacts_metadata |