Add latest changes from gitlab-org/gitlab@master

2 files changed, 18 insertions, 0 deletions

diff --git a/db/migrate/20191028130054_add_max_issue_weight_to_list.rb b/db/migrate/20191028130054_add_max_issue_weight_to_list.rb
new file mode 100644
index 00000000000..eec7c42c907
--- /dev/null
+++ b/db/migrate/20191028130054_add_max_issue_weight_to_list.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddMaxIssueWeightToList < ActiveRecord::Migration[5.2]
+  include Gitlab::Database::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  DOWNTIME = false
+
+  def up
+    add_column_with_default :lists, :max_issue_weight, :integer, default: 0
+  end
+
+  def down
+    remove_column :lists, :max_issue_weight
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5c22ef8fe4b..b31ed03a34f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -2251,6 +2251,7 @@ ActiveRecord::Schema.define(version: 2019_11_19_023952) do
     t.integer "user_id"
     t.integer "milestone_id"
     t.integer "max_issue_count", default: 0, null: false
+    t.integer "max_issue_weight", default: 0, null: false
     t.index ["board_id", "label_id"], name: "index_lists_on_board_id_and_label_id", unique: true
     t.index ["label_id"], name: "index_lists_on_label_id"
     t.index ["list_type"], name: "index_lists_on_list_type"