diff options
| author | Bob Van Landuyt <bob@gitlab.com> | 2017-05-19 07:48:33 +0200 |
|---|---|---|
| committer | kushalpandya <kushal@gitlab.com> | 2017-05-22 13:55:38 +0530 |
| commit | 0007e5bde3fdb87982f16eaf530ae0ea7d90f512 (patch) | |
| tree | 2de2072de4986d24dd45f0780f03970e705cd28e /spec | |
| parent | 2f097402599dc8c734759e1bef3ec2c4534f594d (diff) | |
| download | gitlab-ce-0007e5bde3fdb87982f16eaf530ae0ea7d90f512.tar.gz | |
Resolve migration helper conflictsmr-11396-conflicts
From `master`
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/lib/gitlab/database/migration_helpers_spec.rb | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/spec/lib/gitlab/database/migration_helpers_spec.rb b/spec/lib/gitlab/database/migration_helpers_spec.rb index 942635d3dae..dfa3ae9142e 100644 --- a/spec/lib/gitlab/database/migration_helpers_spec.rb +++ b/spec/lib/gitlab/database/migration_helpers_spec.rb @@ -382,14 +382,12 @@ describe Gitlab::Database::MigrationHelpers, lib: true do expect(model).to receive(:add_column). with(:users, :new, :integer, limit: old_column.limit, -<<<<<<< HEAD - default: old_column.default, - null: old_column.null, -======= ->>>>>>> c53d06c4d8... Merge branch 'dm-rename-column-concurrently-with-null' into 'master'
precision: old_column.precision, scale: old_column.scale) + expect(model).to receive(:change_column_default). + with(:users, :new, old_column.default) + expect(model).to receive(:update_column_in_batches) expect(model).to receive(:change_column_null).with(:users, :new, false) @@ -411,14 +409,12 @@ describe Gitlab::Database::MigrationHelpers, lib: true do expect(model).to receive(:add_column). with(:users, :new, :integer, limit: old_column.limit, -<<<<<<< HEAD - default: old_column.default, - null: old_column.null, -======= ->>>>>>> c53d06c4d8... Merge branch 'dm-rename-column-concurrently-with-null' into 'master'
precision: old_column.precision, scale: old_column.scale) + expect(model).to receive(:change_column_default). + with(:users, :new, old_column.default) + expect(model).to receive(:update_column_in_batches) expect(model).to receive(:change_column_null).with(:users, :new, false) |