diff options
author | Ruben Davila <rdavila84@gmail.com> | 2016-08-31 19:44:56 +0300 |
---|---|---|
committer | Ruben Davila <rdavila84@gmail.com> | 2016-08-31 19:44:56 +0300 |
commit | 82e4552e6883a1b0c52661219d262cebbe760124 (patch) | |
tree | 7be85ec3321a406e808474e22f9c5165d2c7779b /db | |
parent | ff39ccfc3fe12d8974da39cdadae674f28afd0ec (diff) |
Revert "Merge branch 'sh-lock-version-not-null' into 'master'
"
This reverts commit ff39ccfc3fe12d8974da39cdadae674f28afd0ec.
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20160830232601_change_lock_version_not_null.rb | 13 | ||||
-rw-r--r-- | db/schema.rb | 2 |
2 files changed, 1 insertions, 14 deletions
diff --git a/db/migrate/20160830232601_change_lock_version_not_null.rb b/db/migrate/20160830232601_change_lock_version_not_null.rb deleted file mode 100644 index 01c58ed5bdc..00000000000 --- a/db/migrate/20160830232601_change_lock_version_not_null.rb +++ /dev/null @@ -1,13 +0,0 @@ -class ChangeLockVersionNotNull < ActiveRecord::Migration - include Gitlab::Database::MigrationHelpers - - DOWNTIME = false - - def up - change_column_null :issues, :lock_version, true - change_column_null :merge_requests, :lock_version, true - end - - def down - end -end diff --git a/db/schema.rb b/db/schema.rb index b17ee41bdc0..0e1d9fb880b 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: 20160830232601) do +ActiveRecord::Schema.define(version: 20160827011312) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" |