Add latest changes from gitlab-org/gitlab@12-10-stable-ee

3 files changed, 5 insertions, 0 deletions

diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index c1e44748304..0aa0216558f 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -14,6 +14,7 @@ class ApplicationSetting < ApplicationRecord
   add_authentication_token_field :static_objects_external_storage_auth_token
 
   belongs_to :self_monitoring_project, class_name: "Project", foreign_key: 'instance_administration_project_id'
+  belongs_to :push_rule
   alias_attribute :self_monitoring_project_id, :instance_administration_project_id
 
   belongs_to :instance_administrators_group, class_name: "Group"
diff --git a/app/models/project_services/alerts_service.rb b/app/models/project_services/alerts_service.rb
index 2f7902d9617..16bf37fd189 100644
--- a/app/models/project_services/alerts_service.rb
+++ b/app/models/project_services/alerts_service.rb
@@ -15,6 +15,8 @@ class AlertsService < Service
   before_validation :ensure_token, if: :activated?
 
   def url
+    return if instance? || template?
+
     url_helpers.project_alerts_notify_url(project, format: :json)
   end
 
diff --git a/app/models/project_setting.rb b/app/models/project_setting.rb
index 37e4a7be770..7c93faf3928 100644
--- a/app/models/project_setting.rb
+++ b/app/models/project_setting.rb
@@ -9,3 +9,5 @@ class ProjectSetting < ApplicationRecord
     where(primary_key => safe_find_or_create_by(attrs))
   end
 end
+
+ProjectSetting.prepend_if_ee('EE::ProjectSetting')