diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2018-12-07 05:22:15 +0300 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2018-12-17 18:11:35 +0300 |
| commit | 28299e73c49bbbe618dc26690d97f3507e644e3a (patch) | |
| tree | 51861f38bd53ee467658487bd3ea46683565235e /lib | |
| parent | 9fd89ee372202f11164abfeef476fd12414ffdbe (diff) | |
Merge branch 'rs-revert-1e8f1de034aa9b6a60b640b2b091f60c4d3ba365' into 'master'
Revert "Merge branch 'fix/gb/encrypt-ci-build-token' into 'master'"
See merge request gitlab-org/gitlab-ce!23644
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/import_export/import_export.yml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml index d10d4f2f746..fde8561c16c 100644 --- a/lib/gitlab/import_export/import_export.yml +++ b/lib/gitlab/import_export/import_export.yml @@ -143,7 +143,6 @@ excluded_attributes: statuses: - :trace - :token - - :token_encrypted - :when - :artifacts_file - :artifacts_metadata |