Merge remote-tracking branch 'dev/13-2-stable' into 13-2-stable

CHANGELOG.md

@@ -3,6 +3,13 @@
 The latest version of this file can be found at the master branch of the
 omnibus-gitlab repository.
+## 13.2.10 (2020-10-01)
+
+### Security (1 change)
+
+- Add config for remove unaccepted member invites cron worker.
+
+
 ## 13.2.9 (2020-09-04)
 ### Fixed (1 change)

GITALY_SERVER_VERSION

-13.2.9
+13.2.10

VERSION

-13.2.9-ee
+13.2.10-ee

files/gitlab-config-template/gitlab.rb.template

@@ -139,6 +139,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

files/gitlab-cookbooks/gitlab/attributes/default.rb

@@ -126,6 +126,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

files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb

@@ -393,6 +393,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 %>

spec/chef/recipes/gitlab-rails_spec.rb

@@ -1991,6 +1991,30 @@ 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