diff options
author | Michael Kozono <mkozono@gmail.com> | 2019-09-09 23:52:55 +0000 |
---|---|---|
committer | Michael Kozono <mkozono@gmail.com> | 2019-09-09 23:52:55 +0000 |
commit | ffa5328c39f195d3253e586569fc2474d3aa6860 (patch) | |
tree | eb5de3f0eace7806470b7922e9a1dc70a6a6166c | |
parent | 19ea9a95602b215d8c1ceee34a02f4a60bd5e2a3 (diff) | |
parent | 3dd99c9d84ac7f2662ce0afa7eeaab9a25a1acde (diff) | |
download | gitlab-ce-ffa5328c39f195d3253e586569fc2474d3aa6860.tar.gz |
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
-rw-r--r-- | config/sidekiq_queues.yml | 1 | ||||
-rw-r--r-- | spec/lib/gitlab/import_export/all_models.yml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index e89e9657314..f37cd518d48 100644 --- 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] diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml index dafa4243145..e496ab4cd35 100644 --- 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 |