Merge branch 'master' into 'expiration-date-on-memberships'

# Conflicts:
#   db/schema.rb

1 files changed, 6 insertions, 2 deletions

diff --git a/db/schema.rb b/db/schema.rb
index 0398aa673cb..748c4adc889 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -685,12 +685,16 @@ ActiveRecord::Schema.define(version: 20160818205718) do
     t.string   "line_code"
     t.string   "commit_id"
     t.integer  "noteable_id"
-    t.boolean  "system",            default: false, null: false
+    t.boolean  "system",                 default: false, null: false
     t.text     "st_diff"
     t.integer  "updated_by_id"
     t.string   "type"
     t.text     "position"
     t.text     "original_position"
+    t.datetime "resolved_at"
+    t.integer  "resolved_by_id"
+    t.string   "discussion_id"
+    t.string   "original_discussion_id"
   end
 
   add_index "notes", ["author_id"], name: "index_notes_on_author_id", using: :btree
@@ -1147,4 +1151,4 @@ ActiveRecord::Schema.define(version: 20160818205718) 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