summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorJarka Kadlecova <jarka@gitlab.com>2017-09-01 14:03:57 +0200
committerJarka Kadlecova <jarka@gitlab.com>2017-09-14 14:50:32 +0200
commit994e7d135947ca162c147c5e0992a0190de22808 (patch)
treecd9ea4d93269c8597541f8c59e89a83ca2b56d2b /db
parent2b82f907abf2074ac332531d6142893d081f44b9 (diff)
downloadgitlab-ce-994e7d135947ca162c147c5e0992a0190de22808.tar.gz
Create system notes for MR too, improve doc + clean up code
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20170815221154_add_discussion_locked_to_issuable.rb (renamed from db/migrate/20161207221154_add_dicussion_locked_to_issuable.rb)5
-rw-r--r--db/schema.rb4
2 files changed, 3 insertions, 6 deletions
diff --git a/db/migrate/20161207221154_add_dicussion_locked_to_issuable.rb b/db/migrate/20170815221154_add_discussion_locked_to_issuable.rb
index bb60ac2a410..5bd777c53a0 100644
--- a/db/migrate/20161207221154_add_dicussion_locked_to_issuable.rb
+++ b/db/migrate/20170815221154_add_discussion_locked_to_issuable.rb
@@ -1,8 +1,5 @@
-class AddDicussionLockedToIssuable < ActiveRecord::Migration
- include Gitlab::Database::MigrationHelpers
-
+class AddDiscussionLockedToIssuable < ActiveRecord::Migration
DOWNTIME = false
- disable_ddl_transaction!
def up
add_column(:merge_requests, :discussion_locked, :boolean)
diff --git a/db/schema.rb b/db/schema.rb
index 16f38f7b60b..6cdf929b1b6 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -660,7 +660,7 @@ ActiveRecord::Schema.define(version: 20170905112933) do
t.integer "cached_markdown_version"
t.datetime "last_edited_at"
t.integer "last_edited_by_id"
- t.boolean "discussion_locked", default: false, null: false
+ t.boolean "discussion_locked"
end
add_index "issues", ["assignee_id"], name: "index_issues_on_assignee_id", using: :btree
@@ -883,7 +883,7 @@ ActiveRecord::Schema.define(version: 20170905112933) do
t.integer "head_pipeline_id"
t.boolean "ref_fetched"
t.string "merge_jid"
- t.boolean "discussion_locked", default: false, null: false
+ t.boolean "discussion_locked"
end
add_index "merge_requests", ["assignee_id"], name: "index_merge_requests_on_assignee_id", using: :btree