Skip to content
Snippets Groups Projects
Commit f0ba6699 authored by Imre (Admin)'s avatar Imre (Admin)
Browse files

Add config for remove unaccepted member invites cron worker

parent 6ebab448
No related branches found
No related tags found
No related merge requests found
---
title: Add config for remove unaccepted member invites cron worker
merge_request:
author:
type: security
Loading
Loading
@@ -143,6 +143,7 @@ external_url 'GENERATED_EXTERNAL_URL'
# gitlab_rails['pages_domain_verification_cron_worker'] = "*/15 * * * *"
# gitlab_rails['pages_domain_ssl_renewal_cron_worker'] = "*/10 * * * *"
# gitlab_rails['pages_domain_removal_cron_worker'] = "47 0 * * *"
# gitlab_rails['remove_unaccepted_member_invites_cron_worker'] = "10 15 * * *"
# gitlab_rails['schedule_migrate_external_diffs_worker_cron'] = "15 * * * *"
 
### Webhook Settings
Loading
Loading
Loading
Loading
@@ -127,6 +127,7 @@ default['gitlab']['gitlab-rails']['ci_archive_traces_cron_worker'] = nil
default['gitlab']['gitlab-rails']['pages_domain_verification_cron_worker'] = nil
default['gitlab']['gitlab-rails']['pages_domain_ssl_renewal_cron_worker'] = nil
default['gitlab']['gitlab-rails']['pages_domain_removal_cron_worker'] = nil
default['gitlab']['gitlab-rails']['remove_unaccepted_member_invites_cron_worker'] = nil
default['gitlab']['gitlab-rails']['schedule_migrate_external_diffs_worker_cron'] = nil
default['gitlab']['gitlab-rails']['historical_data_worker_cron'] = nil
default['gitlab']['gitlab-rails']['ldap_sync_worker_cron'] = nil
Loading
Loading
Loading
Loading
@@ -397,6 +397,12 @@ production: &base
pages_domain_removal_cron_worker:
cron:<% if @pages_domain_removal_cron_worker %> "<%= @pages_domain_removal_cron_worker %>"<% end %>
 
# Remove unaccepted member invitations
<% unless @remove_unaccepted_member_invites_cron_worker.nil? %>
remove_unaccepted_member_invites_worker:
cron: "<%= @remove_unaccepted_member_invites_cron_worker %>"
<% end %>
# Periodically migrate diffs from the database to external storage
schedule_migrate_external_diffs_worker:
cron:<% if @schedule_migrate_external_diffs_worker_cron %> "<%= @schedule_migrate_external_diffs_worker_cron %>"<% end %>
Loading
Loading
Loading
Loading
@@ -2022,6 +2022,30 @@ RSpec.describe 'gitlab::gitlab-rails' do
end
end
 
context 'Remove unaccepted member invitations cron job settings' do
context 'when the cron pattern is configured' do
it 'sets the value' do
stub_gitlab_rb(gitlab_rails: { remove_unaccepted_member_invites_cron_worker: '1 * 3 * 5' })
expect(chef_run).to create_templatesymlink('Create a gitlab.yml and create a symlink to Rails root').with_variables(
hash_including(
'remove_unaccepted_member_invites_cron_worker' => '1 * 3 * 5'
)
)
end
end
context 'when cron worker is not configured' do
it ' sets no value' do
expect(chef_run).to create_templatesymlink('Create a gitlab.yml and create a symlink to Rails root').with_variables(
hash_including(
'remove_unaccepted_member_invites_cron_worker' => nil
)
)
end
end
end
context 'External diff migration cron job settings' do
context 'when the cron pattern is configured' do
it 'sets the value' do
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment