Add latest changes from gitlab-org/gitlab@master

2 files changed, 11 insertions, 1 deletions

diff --git a/db/migrate/20200205143231_add_dissmised_at_to_user_callouts.rb b/db/migrate/20200205143231_add_dissmised_at_to_user_callouts.rb
new file mode 100644
index 00000000000..f9942d442b5
--- /dev/null
+++ b/db/migrate/20200205143231_add_dissmised_at_to_user_callouts.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddDissmisedAtToUserCallouts < ActiveRecord::Migration[5.2]
+  DOWNTIME = false
+
+  def change
+    add_column :user_callouts, :dismissed_at, :datetime_with_timezone
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 1050b265acb..79c00c10a2d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_02_04_131054) do
+ActiveRecord::Schema.define(version: 2020_02_05_143231) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_trgm"
@@ -4101,6 +4101,7 @@ ActiveRecord::Schema.define(version: 2020_02_04_131054) do
   create_table "user_callouts", id: :serial, force: :cascade do |t|
     t.integer "feature_name", null: false
     t.integer "user_id", null: false
+    t.datetime_with_timezone "dismissed_at"
     t.index ["user_id", "feature_name"], name: "index_user_callouts_on_user_id_and_feature_name", unique: true
     t.index ["user_id"], name: "index_user_callouts_on_user_id"
   end