diff options
author | Michael Kozono <mkozono@gmail.com> | 2018-02-15 12:08:00 -0800 |
---|---|---|
committer | Michael Kozono <mkozono@gmail.com> | 2018-02-15 12:08:00 -0800 |
commit | f2059798465da6c4cd50174ed16ec087e7d8e010 (patch) | |
tree | 551a249348a30098a6765988a632a520c03aa1a7 | |
parent | 2ca4123c6e44aa3554d2db1bb8a32aa225eafa49 (diff) | |
download | gitlab-ce-f2059798465da6c4cd50174ed16ec087e7d8e010.tar.gz |
Resolve conflict in prepare_untracked_uploads_spec.rb
-rw-r--r-- | spec/lib/gitlab/background_migration/prepare_untracked_uploads_spec.rb | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/spec/lib/gitlab/background_migration/prepare_untracked_uploads_spec.rb b/spec/lib/gitlab/background_migration/prepare_untracked_uploads_spec.rb index aaddfc4048e..4c4c143afd6 100644 --- a/spec/lib/gitlab/background_migration/prepare_untracked_uploads_spec.rb +++ b/spec/lib/gitlab/background_migration/prepare_untracked_uploads_spec.rb @@ -96,34 +96,7 @@ describe Gitlab::BackgroundMigration::PrepareUntrackedUploads, :sidekiq do # E.g. The installation is in use at the time of migration, and someone has # just uploaded a file context 'when there are files in /uploads/tmp' do -<<<<<<< HEAD - it_behaves_like 'does not add files in /uploads/tmp' - end - end - end - - context 'test bulk insert without ON CONFLICT DO NOTHING or IGNORE' do - before do - # If this is CI, we use Postgres 9.2 so this stub has no effect. - # - # If this is being run on Postgres 9.5+ or MySQL, then this stub allows us - # to test the bulk insert functionality without ON CONFLICT DO NOTHING or - # IGNORE. - allow_any_instance_of(described_class).to receive(:postgresql_pre_9_5?).and_return(true) - end - - context 'when files were uploaded before and after hashed storage was enabled' do - let!(:appearance) { create_or_update_appearance(logo: uploaded_file, header_logo: uploaded_file) } - let!(:user) { create(:user, :with_avatar) } - let!(:project1) { create(:project, :with_avatar) } - let(:project2) { create(:project) } # instantiate after enabling hashed_storage - - before do - # Markdown upload before enabling hashed_storage - UploadService.new(project1, uploaded_file, FileUploader).execute -======= let(:tmp_file) { Rails.root.join(described_class::ABSOLUTE_UPLOAD_DIR, 'tmp', 'some_file.jpg') } ->>>>>>> c133f1a7480... Merge branch 'mk-fix-no-untracked-upload-files-error' into 'master' before do FileUtils.mkdir(File.dirname(tmp_file)) |