Add latest changes from gitlab-org/gitlab@master

2 files changed, 12 insertions, 0 deletions

diff --git a/db/migrate/20190606202100_add_name_to_badges.rb b/db/migrate/20190606202100_add_name_to_badges.rb
new file mode 100644
index 00000000000..472e1202ad8
--- /dev/null
+++ b/db/migrate/20190606202100_add_name_to_badges.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class AddNameToBadges < ActiveRecord::Migration[5.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def change
+    add_column :badges, :name, :string, null: true, limit: 255
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 8777e6394d8..7b21db5b098 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -498,6 +498,7 @@ ActiveRecord::Schema.define(version: 2019_11_19_023952) do
     t.integer "project_id"
     t.integer "group_id"
     t.string "type", null: false
+    t.string "name", limit: 255
     t.datetime_with_timezone "created_at", null: false
     t.datetime_with_timezone "updated_at", null: false
     t.index ["group_id"], name: "index_badges_on_group_id"