Merge branch '14708-refresh-license-approval-new-blacklist-item' into 'master'

Add approval MR rule to all_models.yml See merge request gitlab-org/gitlab-ce!32618
2019-09-09 23:52:55 +00:00 · 2019-09-09 23:52:55 +00:00 · ffa5328c39
parent 19ea9a9560 3dd99c9d84
commit ffa5328c39
2 changed files with 2 additions and 0 deletions
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@ -116,3 +116,4 @@
  - [incident_management, 2]
  - [jira_connect, 1]
  - [update_external_pull_requests, 3]
+  - [refresh_license_compliance_checks, 2]
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@ -376,6 +376,7 @@ project:
 - index_status
 - feature_usage
 - approval_rules
+- approval_merge_request_rules
 - approvers
 - approver_users
 - pages_domains