diff options
| author | Ruben Davila <rdavila84@gmail.com> | 2016-08-31 11:45:41 -0500 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2016-08-31 11:45:41 -0500 |
| commit | 77f99c5be4d1802cba705d6cbba4e7cdd8a7f386 (patch) | |
| tree | 007e41ca1a7b1b785af804c7852e86bb18195164 | |
| parent | 82e4552e6883a1b0c52661219d262cebbe760124 (diff) | |
| download | gitlab-ce-77f99c5be4d1802cba705d6cbba4e7cdd8a7f386.tar.gz | |
Revert "Merge branch 'lock_fix' into 'master'"
This reverts commit d836a359b7a9eee7dd379a99022e3bb709cd9995.
| -rw-r--r-- | db/migrate/20160827011312_ensure_lock_version_has_no_default.rb | 16 | ||||
| -rw-r--r-- | db/schema.rb | 4 |
2 files changed, 2 insertions, 18 deletions
diff --git a/db/migrate/20160827011312_ensure_lock_version_has_no_default.rb b/db/migrate/20160827011312_ensure_lock_version_has_no_default.rb deleted file mode 100644 index 7c55bc23cf2..00000000000 --- a/db/migrate/20160827011312_ensure_lock_version_has_no_default.rb +++ /dev/null @@ -1,16 +0,0 @@ -class EnsureLockVersionHasNoDefault < ActiveRecord::Migration - include Gitlab::Database::MigrationHelpers - - DOWNTIME = false - - def up - change_column_default :issues, :lock_version, nil - change_column_default :merge_requests, :lock_version, nil - - execute('UPDATE issues SET lock_version = 1 WHERE lock_version = 0') - execute('UPDATE merge_requests SET lock_version = 1 WHERE lock_version = 0') - end - - def down - end -end diff --git a/db/schema.rb b/db/schema.rb index 0e1d9fb880b..6cbc766831b 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20160827011312) do +ActiveRecord::Schema.define(version: 20160819221833) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -1154,4 +1154,4 @@ ActiveRecord::Schema.define(version: 20160827011312) do add_foreign_key "protected_branch_merge_access_levels", "protected_branches" add_foreign_key "protected_branch_push_access_levels", "protected_branches" add_foreign_key "u2f_registrations", "users" -end +end
\ No newline at end of file |