diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-02-22 12:09:27 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-02-22 12:09:27 +0000 |
| commit | 011ddb51b40897bc13a75d78c9e992f559cbde48 (patch) | |
| tree | d2f25aa76ab1466ecca82d2cf07e3594b8d7addc /spec/migrations | |
| parent | a75cce1febf0403d66631841fff3bfbeefbfe6e3 (diff) | |
| parent | eb421c88ee2a57a437b9b14ba7447a04720354ac (diff) | |
| download | gitlab-ce-011ddb51b40897bc13a75d78c9e992f559cbde48.tar.gz | |
Merge branch 'master' into 'backstage/gb/build-stages-catch-up-migration'
# Conflicts:
# db/schema.rb
Diffstat (limited to 'spec/migrations')
| -rw-r--r-- | spec/migrations/track_untracked_uploads_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/migrations/track_untracked_uploads_spec.rb b/spec/migrations/track_untracked_uploads_spec.rb index fe4d5b8a279..2fccfb3f12c 100644 --- a/spec/migrations/track_untracked_uploads_spec.rb +++ b/spec/migrations/track_untracked_uploads_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' require Rails.root.join('db', 'post_migrate', '20171103140253_track_untracked_uploads') describe TrackUntrackedUploads, :migration, :sidekiq do - include TrackUntrackedUploadsHelpers + include MigrationsHelpers::TrackUntrackedUploadsHelpers it 'correctly schedules the follow-up background migration' do Sidekiq::Testing.fake! do |