summaryrefslogtreecommitdiff
path: root/lib/gitlab/import_export
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2018-12-06 18:53:24 -0600
committerRobert Speicher <rspeicher@gmail.com>2018-12-06 18:53:24 -0600
commit950b9130adcb4d2fa45bd1757c1b3dc50f1df9a4 (patch)
treea39525f22b03ba9587bcd3efc7d846e0b4406db6 /lib/gitlab/import_export
parent9a78524f465488b2b5daa3fbdb2ec7c71c9641a6 (diff)
downloadgitlab-ce-950b9130adcb4d2fa45bd1757c1b3dc50f1df9a4.tar.gz
Revert "Merge branch 'fix/gb/encrypt-ci-build-token' into 'master'"
This reverts commit 1e8f1de034aa9b6a60b640b2b091f60c4d3ba365, reversing changes made to 62d971129da99936a3cdc04f3740d26f16a0c7a6.
Diffstat (limited to 'lib/gitlab/import_export')
-rw-r--r--lib/gitlab/import_export/import_export.yml1
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