diff options
Diffstat (limited to 'lib/gitlab')
3 files changed, 16 insertions, 12 deletions
diff --git a/lib/gitlab/database/background_migration/batched_job.rb b/lib/gitlab/database/background_migration/batched_job.rb index 6b7ff308c7e..5f922d87c6f 100644 --- a/lib/gitlab/database/background_migration/batched_job.rb +++ b/lib/gitlab/database/background_migration/batched_job.rb @@ -100,8 +100,6 @@ module Gitlab delegate :job_class, :table_name, :column_name, :job_arguments, :job_class_name, to: :batched_migration, prefix: :migration - attribute :pause_ms, :integer, default: 100 - def time_efficiency return unless succeeded? return unless finished_at && started_at diff --git a/lib/gitlab/database/background_migration/batched_migration.rb b/lib/gitlab/database/background_migration/batched_migration.rb index 61a660ad14c..429dc79e170 100644 --- a/lib/gitlab/database/background_migration/batched_migration.rb +++ b/lib/gitlab/database/background_migration/batched_migration.rb @@ -83,8 +83,6 @@ module Gitlab end end - attribute :pause_ms, :integer, default: 100 - def self.valid_status state_machine.states.map(&:name) end diff --git a/lib/gitlab/database_importers/work_items/base_type_importer.rb b/lib/gitlab/database_importers/work_items/base_type_importer.rb index 9796a5905e3..85ac816f712 100644 --- a/lib/gitlab/database_importers/work_items/base_type_importer.rb +++ b/lib/gitlab/database_importers/work_items/base_type_importer.rb @@ -18,7 +18,8 @@ module Gitlab progress: 'Progress', status: 'Status', requirement_legacy: 'Requirement legacy', - test_reports: 'Test reports' + test_reports: 'Test reports', + notifications: 'Notifications' }.freeze WIDGETS_FOR_TYPE = { @@ -32,23 +33,27 @@ module Gitlab :notes, :iteration, :weight, - :health_status + :health_status, + :notifications ], incident: [ :description, :hierarchy, - :notes + :notes, + :notifications ], test_case: [ :description, - :notes + :notes, + :notifications ], requirement: [ :description, :notes, :status, :requirement_legacy, - :test_reports + :test_reports, + :notifications ], task: [ :assignees, @@ -59,7 +64,8 @@ module Gitlab :milestone, :notes, :iteration, - :weight + :weight, + :notifications ], objective: [ :assignees, @@ -69,7 +75,8 @@ module Gitlab :milestone, :notes, :health_status, - :progress + :progress, + :notifications ], key_result: [ :assignees, @@ -79,7 +86,8 @@ module Gitlab :start_and_due_date, :notes, :health_status, - :progress + :progress, + :notifications ] }.freeze |