diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-20 09:07:06 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-20 09:07:06 +0300 |
| commit | dd4c30182c16fe27efbbf4c19594bb292fb4ac48 (patch) | |
| tree | 3d2e0235a0ab5333a6a2d4990da409640dd2d26f /spec/lib | |
| parent | accf0d7db3d58a62212125703df39e341d327ec6 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib')
| -rw-r--r-- | spec/lib/gitlab/background_migration/legacy_upload_mover_spec.rb | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/import_export/all_models.yml | 1 | ||||
| -rw-r--r-- | spec/lib/gitlab/multi_destination_logger_spec.rb | 3 |
3 files changed, 2 insertions, 4 deletions
diff --git a/spec/lib/gitlab/background_migration/legacy_upload_mover_spec.rb b/spec/lib/gitlab/background_migration/legacy_upload_mover_spec.rb index c522c8b307f..71e9a568370 100644 --- a/spec/lib/gitlab/background_migration/legacy_upload_mover_spec.rb +++ b/spec/lib/gitlab/background_migration/legacy_upload_mover_spec.rb @@ -139,7 +139,7 @@ RSpec.describe Gitlab::BackgroundMigration::LegacyUploadMover, :aggregate_failur end context 'when an upload belongs to a legacy_diff_note' do - let!(:merge_request) { create(:merge_request, source_project: project) } + let!(:merge_request) { create(:merge_request, :skip_diff_creation, source_project: project) } let!(:note) do create(:legacy_diff_note_on_merge_request, diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml index f6bdbc86cc5..0340c7db75d 100644 --- a/spec/lib/gitlab/import_export/all_models.yml +++ b/spec/lib/gitlab/import_export/all_models.yml @@ -249,6 +249,7 @@ merge_request_diff: - merge_request_diff_commits - merge_request_diff_detail - merge_request_diff_files +- merge_request_diff_llm_summary merge_request_diff_commits: - merge_request_diff - commit_author diff --git a/spec/lib/gitlab/multi_destination_logger_spec.rb b/spec/lib/gitlab/multi_destination_logger_spec.rb index e0d76afd9bf..53a8541bcb7 100644 --- a/spec/lib/gitlab/multi_destination_logger_spec.rb +++ b/spec/lib/gitlab/multi_destination_logger_spec.rb @@ -2,9 +2,6 @@ require 'spec_helper' -class FakeLogger -end - class LoggerA < Gitlab::Logger def self.file_name_noext 'loggerA' |