diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-11-28 15:14:04 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-11-28 15:14:04 +0300 |
| commit | 0b8a2779e788bd05180176a11ac585fd7999b76b (patch) | |
| tree | 9426c5fe4eb41513af5066889891c10187da6f9b /lib/gitlab/import_export | |
| parent | 4c7665f2f930bba855646143684070544044de10 (diff) | |
| parent | 0f800a5c0532508c84cee24bf44a4b9ce68168a2 (diff) | |
Merge branch 'master' into fix/gb/encrypt-runners-tokens
* master: (243 commits)
Conflicts:
db/schema.rb
lib/gitlab/import_export/import_export.yml
Diffstat (limited to 'lib/gitlab/import_export')
| -rw-r--r-- | lib/gitlab/import_export/import_export.yml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml index 22fd37447a1..4f3298812a8 100644 --- a/lib/gitlab/import_export/import_export.yml +++ b/lib/gitlab/import_export/import_export.yml @@ -98,14 +98,12 @@ excluded_attributes: - :avatar - :import_type - :import_source - - :import_error - :mirror - :runners_token - :runners_token_encrypted - :repository_storage - :repository_read_only - :lfs_enabled - - :import_jid - :created_at - :updated_at - :id @@ -120,6 +118,9 @@ excluded_attributes: namespaces: - :runners_token - :runners_token_encrypted + project_import_state: + - :last_error + - :jid prometheus_metrics: - :common - :identifier |