diff options
| author | Michael Kozono <mkozono@gmail.com> | 2019-04-08 20:11:46 +0000 |
|---|---|---|
| committer | Michael Kozono <mkozono@gmail.com> | 2019-04-08 20:11:46 +0000 |
| commit | b22a725a0c8c122515a16beff50a008b46c4462a (patch) | |
| tree | fdaa9df353506329494f249794f721a65352f298 /spec/lib/gitlab | |
| parent | b0854042923e9e8ad6b3f34b29631ffaa127d06e (diff) | |
| parent | 0f5b735685476ff51b26031e9b74fa8256354868 (diff) | |
| download | gitlab-ce-b22a725a0c8c122515a16beff50a008b46c4462a.tar.gz | |
Merge branch 'sh-fix-issue-59985' into 'master'
Fix stage index migration failing in PostgreSQL 10
Closes #59985
See merge request gitlab-org/gitlab-ce!26972
Diffstat (limited to 'spec/lib/gitlab')
| -rw-r--r-- | spec/lib/gitlab/background_migration/migrate_stage_index_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/background_migration/migrate_stage_index_spec.rb b/spec/lib/gitlab/background_migration/migrate_stage_index_spec.rb index f8107dd40b9..4db829b1e7b 100644 --- a/spec/lib/gitlab/background_migration/migrate_stage_index_spec.rb +++ b/spec/lib/gitlab/background_migration/migrate_stage_index_spec.rb @@ -30,6 +30,6 @@ describe Gitlab::BackgroundMigration::MigrateStageIndex, :migration, schema: 201 described_class.new.perform(100, 101) - expect(stages.all.pluck(:position)).to eq [2, 3] + expect(stages.all.order(:id).pluck(:position)).to eq [2, 3] end end |