Automatic merge of gitlab-org/gitlab master

db/structure.sql

@@ -12749,10 +12749,10 @@ CREATE TABLE group_wiki_repositories (
 
 CREATE TABLE historical_data (
     id integer NOT NULL,
+    date date,
     active_user_count integer,
     created_at timestamp without time zone,
     updated_at timestamp without time zone,
-    date date,
     recorded_at timestamp with time zone,
     CONSTRAINT check_640e8cf66c CHECK ((recorded_at IS NOT NULL))
 );

spec/support/shared_examples/services/alert_management_shared_examples.rb

@@ -8,11 +8,11 @@ RSpec.shared_examples 'creates an alert management alert' do
   end
 
   it 'executes the alert service hooks' do
-    slack_service = create(:service, type: 'SlackService', project: project, alert_events: true, active: true)
+    expect_next_instance_of(AlertManagement::Alert) do |alert|
+      expect(alert).to receive(:execute_services)
+    end
 
     subject
-
-    expect(ProjectServiceWorker).to have_received(:perform_async).with(slack_service.id, an_instance_of(Hash))
   end
 end