Add latest changes from gitlab-org/gitlab@master

3 files changed, 18 insertions, 1 deletions

diff --git a/db/migrate/20210616134905_add_timestamp_to_schema_migration.rb b/db/migrate/20210616134905_add_timestamp_to_schema_migration.rb
new file mode 100644
index 00000000000..7086b20c48f
--- /dev/null
+++ b/db/migrate/20210616134905_add_timestamp_to_schema_migration.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class AddTimestampToSchemaMigration < ActiveRecord::Migration[6.1]
+  def up
+    # Add a nullable column with default null first
+    add_column :schema_migrations, :finished_at, :timestamptz
+
+    # Change default to NOW() for new records
+    change_column_default :schema_migrations, :finished_at, -> { 'NOW()' }
+  end
+
+  def down
+    remove_column :schema_migrations, :finished_at
+  end
+end
diff --git a/db/schema_migrations/20210616134905 b/db/schema_migrations/20210616134905
new file mode 100644
index 00000000000..90658174989
--- /dev/null
+++ b/db/schema_migrations/20210616134905
@@ -0,0 +1 @@
+52843d12ab18b92c71a334cf877682d9fae57632cf0ba14213dfc0543e39cf1b
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index a67964b30d2..9effc26af91 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -17715,7 +17715,8 @@ CREATE SEQUENCE saml_providers_id_seq
 ALTER SEQUENCE saml_providers_id_seq OWNED BY saml_providers.id;
 
 CREATE TABLE schema_migrations (
-    version character varying NOT NULL
+    version character varying NOT NULL,
+    finished_at timestamp with time zone DEFAULT now()
 );
 
 CREATE TABLE scim_identities (