summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-08-31 00:02:04 +0000
committerStan Hu <stanhu@gmail.com>2016-08-31 00:02:04 +0000
commit4d042afeced540c0acd887714d8ec7c962b7c507 (patch)
tree27ff6f47fbc8a6543865c4359bc12f335920317e
parent9ba9e0985394bb0aecf7dab51fe75e8dab4580b8 (diff)
parentcc3b6f12cca88d25490ef7075b69cc9fad0f04d4 (diff)
downloadgitlab-ce-4d042afeced540c0acd887714d8ec7c962b7c507.tar.gz
Merge branch 'sh-lock-version-not-null' into 'master'
Remove not-null constraint on lock_version column if it exists Closes #21678 See merge request !6118
-rw-r--r--db/migrate/20160830232601_change_lock_version_not_null.rb13
-rw-r--r--db/schema.rb2
2 files changed, 14 insertions, 1 deletions
diff --git a/db/migrate/20160830232601_change_lock_version_not_null.rb b/db/migrate/20160830232601_change_lock_version_not_null.rb
new file mode 100644
index 00000000000..01c58ed5bdc
--- /dev/null
+++ b/db/migrate/20160830232601_change_lock_version_not_null.rb
@@ -0,0 +1,13 @@
+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 e1ce7085c62..963d528d170 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: 20160830232601) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"