diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-29 15:08:59 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-29 15:08:59 +0000 |
| commit | 23288f62da73fb0e30d8e7ce306665e8fda1b932 (patch) | |
| tree | 2baf1339e4d7c7c35d6b8a52cfb90597a5d4cdf1 /spec/lib | |
| parent | 7cc6872401eb487ed20dbb9d455f8bb9c97d9e39 (diff) | |
| download | gitlab-ce-23288f62da73fb0e30d8e7ce306665e8fda1b932.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib')
| -rw-r--r-- | spec/lib/gitlab/database/sha_attribute_spec.rb | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/import_export/all_models.yml | 5 | ||||
| -rw-r--r-- | spec/lib/gitlab/import_export/safe_model_attributes.yml | 25 |
3 files changed, 31 insertions, 1 deletions
diff --git a/spec/lib/gitlab/database/sha_attribute_spec.rb b/spec/lib/gitlab/database/sha_attribute_spec.rb index c6fc55291f5..15695bc8069 100644 --- a/spec/lib/gitlab/database/sha_attribute_spec.rb +++ b/spec/lib/gitlab/database/sha_attribute_spec.rb @@ -25,7 +25,7 @@ describe Gitlab::Database::ShaAttribute do describe '#serialize' do it 'converts a SHA String to binary data' do - expect(attribute.serialize(sha).to_s).to eq(binary_sha) + expect(described_class.serialize(sha).to_s).to eq(binary_sha) end end end diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml index 08e57e541a4..22c2fc5545e 100644 --- a/spec/lib/gitlab/import_export/all_models.yml +++ b/spec/lib/gitlab/import_export/all_models.yml @@ -125,6 +125,8 @@ merge_requests: - merge_user - merge_request_diffs - merge_request_diff +- merge_request_context_commits +- merge_request_context_commit_diff_files - events - merge_requests_closing_issues - cached_closes_issues @@ -170,6 +172,9 @@ merge_request_diff_commits: - merge_request_diff merge_request_diff_files: - merge_request_diff +merge_request_context_commits: +- merge_request +- diff_files ci_pipelines: - project - user diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml index ad363233bfe..9c4854a30ad 100644 --- a/spec/lib/gitlab/import_export/safe_model_attributes.yml +++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml @@ -225,6 +225,31 @@ MergeRequestDiffFile: - b_mode - too_large - binary +MergeRequestContextCommit: +- id +- authored_date +- committed_date +- relative_order +- sha +- author_name +- author_email +- committer_name +- committer_email +- message +- merge_request_id +MergeRequestContextCommitDiffFile: +- sha +- relative_order +- new_file +- renamed_file +- deleted_file +- new_path +- old_path +- a_mode +- b_mode +- too_large +- binary +- text MergeRequest::Metrics: - id - created_at |