Add latest changes from gitlab-org/gitlab@master

3 files changed, 13 insertions, 0 deletions

diff --git a/db/migrate/20210201034649_add_active_periods_to_on_call_rotations.rb b/db/migrate/20210201034649_add_active_periods_to_on_call_rotations.rb
new file mode 100644
index 00000000000..714187f60e0
--- /dev/null
+++ b/db/migrate/20210201034649_add_active_periods_to_on_call_rotations.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class AddActivePeriodsToOnCallRotations < ActiveRecord::Migration[6.0]
+  DOWNTIME = false
+
+  def change
+    add_column :incident_management_oncall_rotations, :active_period_start, :time, null: true
+    add_column :incident_management_oncall_rotations, :active_period_end, :time, null: true
+  end
+end
diff --git a/db/schema_migrations/20210201034649 b/db/schema_migrations/20210201034649
new file mode 100644
index 00000000000..5cc99ebc893
--- /dev/null
+++ b/db/schema_migrations/20210201034649
@@ -0,0 +1 @@
+e5492820a8618d5599429ece04ea941e869c84c22d213d536644bcefc5775363
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 811f80ea9e9..87e6d3e6cbb 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -13217,6 +13217,8 @@ CREATE TABLE incident_management_oncall_rotations (
     starts_at timestamp with time zone NOT NULL,
     name text NOT NULL,
     ends_at timestamp with time zone,
+    active_period_start time without time zone,
+    active_period_end time without time zone,
     CONSTRAINT check_5209fb5d02 CHECK ((char_length(name) <= 200))
 );