diff --git a/files/gitlab-config-template/gitlab.rb.template b/files/gitlab-config-template/gitlab.rb.template index 9d93c8331a1f90aad876b0bd17aac5f9ec2b8a15_ZmlsZXMvZ2l0bGFiLWNvbmZpZy10ZW1wbGF0ZS9naXRsYWIucmIudGVtcGxhdGU=..755e835d35655e3059e23247bb2c3f9b452ac437_ZmlsZXMvZ2l0bGFiLWNvbmZpZy10ZW1wbGF0ZS9naXRsYWIucmIudGVtcGxhdGU= 100644 --- a/files/gitlab-config-template/gitlab.rb.template +++ b/files/gitlab-config-template/gitlab.rb.template @@ -443,10 +443,6 @@ ### Usage Statistics # gitlab_rails['usage_ping_enabled'] = true -### Seat Link setting -###! Docs: https://docs.gitlab.com/ee/subscriptions/index.html#seat-link -# gitlab_rails['seat_link_enabled'] = true - ### GitLab Mattermost ###! These settings are void if Mattermost is installed on the same omnibus ###! install diff --git a/files/gitlab-cookbooks/gitlab/attributes/default.rb b/files/gitlab-cookbooks/gitlab/attributes/default.rb index 9d93c8331a1f90aad876b0bd17aac5f9ec2b8a15_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvYXR0cmlidXRlcy9kZWZhdWx0LnJi..755e835d35655e3059e23247bb2c3f9b452ac437_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvYXR0cmlidXRlcy9kZWZhdWx0LnJi 100644 --- a/files/gitlab-cookbooks/gitlab/attributes/default.rb +++ b/files/gitlab-cookbooks/gitlab/attributes/default.rb @@ -290,7 +290,6 @@ default['gitlab']['gitlab-rails']['registry_notification_secret'] = nil default['gitlab']['gitlab-rails']['impersonation_enabled'] = nil default['gitlab']['gitlab-rails']['application_settings_cache_seconds'] = nil -default['gitlab']['gitlab-rails']['seat_link_enabled'] = true default['gitlab']['gitlab-rails']['sentry_enabled'] = false default['gitlab']['gitlab-rails']['sentry_dsn'] = nil default['gitlab']['gitlab-rails']['sentry_clientside_dsn'] = nil diff --git a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb index 9d93c8331a1f90aad876b0bd17aac5f9ec2b8a15_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvdGVtcGxhdGVzL2RlZmF1bHQvZ2l0bGFiLnltbC5lcmI=..755e835d35655e3059e23247bb2c3f9b452ac437_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWIvdGVtcGxhdGVzL2RlZmF1bHQvZ2l0bGFiLnltbC5lcmI= 100644 --- a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb +++ b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb @@ -125,10 +125,6 @@ usage_ping_enabled: <%= @usage_ping_enabled %> - # Seat link setting - # When disabled the customer instances would not send seat link information via cron service everyday. (default: true) - seat_link_enabled: <%= @seat_link_enabled %> - ## Print initial root password to stdout during initialization display_initial_root_password: <%= @display_initial_root_password %> diff --git a/spec/chef/recipes/gitlab-rails/gitlab_spec.rb b/spec/chef/recipes/gitlab-rails/gitlab_spec.rb index 9d93c8331a1f90aad876b0bd17aac5f9ec2b8a15_c3BlYy9jaGVmL3JlY2lwZXMvZ2l0bGFiLXJhaWxzL2dpdGxhYl9zcGVjLnJi..755e835d35655e3059e23247bb2c3f9b452ac437_c3BlYy9jaGVmL3JlY2lwZXMvZ2l0bGFiLXJhaWxzL2dpdGxhYl9zcGVjLnJi 100644 --- a/spec/chef/recipes/gitlab-rails/gitlab_spec.rb +++ b/spec/chef/recipes/gitlab-rails/gitlab_spec.rb @@ -203,27 +203,5 @@ end end end - - describe 'Seat link' do - context 'with default configuration' do - it 'renders gitlab.yml with seat link enabled' do - expect(gitlab_yml[:production][:gitlab][:seat_link_enabled]).to be true - end - end - - context 'with seat link explicitly disabled by the user' do - before do - stub_gitlab_rb( - gitlab_rails: { - seat_link_enabled: false - } - ) - end - - it 'renders gitlab.yml with user specified value for Seat Link' do - expect(gitlab_yml[:production][:gitlab][:seat_link_enabled]).to be false - end - end - end end end