diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 17:34:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 17:34:42 +0300 |
| commit | 9f46488805e86b1bc341ea1620b866016c2ce5ed (patch) | |
| tree | f9748c7e287041e37d6da49e0a29c9511dc34768 /spec/fixtures/config | |
| parent | dfc92d081ea0332d69c8aca2f0e745cb48ae5e6d (diff) | |
Add latest changes from gitlab-org/gitlab@13-0-stable-ee
Diffstat (limited to 'spec/fixtures/config')
5 files changed, 18 insertions, 16 deletions
diff --git a/spec/fixtures/config/mail_room_enabled.yml b/spec/fixtures/config/mail_room_enabled.yml index e1f4c2f44de..535528b32ca 100644 --- a/spec/fixtures/config/mail_room_enabled.yml +++ b/spec/fixtures/config/mail_room_enabled.yml @@ -9,6 +9,7 @@ test: ssl: true start_tls: false mailbox: "inbox" + expunge_deleted: true service_desk_email: enabled: true @@ -20,3 +21,4 @@ test: ssl: true start_tls: false mailbox: "inbox" + expunge_deleted: true diff --git a/spec/fixtures/config/redis_cache_new_format_host.yml b/spec/fixtures/config/redis_cache_new_format_host.yml index a24f3716391..02b9e7384ac 100644 --- a/spec/fixtures/config/redis_cache_new_format_host.yml +++ b/spec/fixtures/config/redis_cache_new_format_host.yml @@ -7,7 +7,7 @@ development: host: localhost port: 26380 # point to sentinel, not to redis port - - host: slave2 + host: replica2 port: 26380 # point to sentinel, not to redis port test: url: redis://:mynewpassword@localhost:6380/10 @@ -16,14 +16,14 @@ test: host: localhost port: 26380 # point to sentinel, not to redis port - - host: slave2 + host: replica2 port: 26380 # point to sentinel, not to redis port production: url: redis://:mynewpassword@localhost:6380/10 sentinels: - - host: slave1 + host: replica1 port: 26380 # point to sentinel, not to redis port - - host: slave2 + host: replica2 port: 26380 # point to sentinel, not to redis port diff --git a/spec/fixtures/config/redis_new_format_host.yml b/spec/fixtures/config/redis_new_format_host.yml index 8d134d467e9..dc8d74c63fa 100644 --- a/spec/fixtures/config/redis_new_format_host.yml +++ b/spec/fixtures/config/redis_new_format_host.yml @@ -7,7 +7,7 @@ development: host: localhost port: 26379 # point to sentinel, not to redis port - - host: slave2 + host: replica2 port: 26379 # point to sentinel, not to redis port test: url: redis://:mynewpassword@localhost:6379/99 @@ -16,14 +16,14 @@ test: host: localhost port: 26379 # point to sentinel, not to redis port - - host: slave2 + host: replica2 port: 26379 # point to sentinel, not to redis port production: url: redis://:mynewpassword@localhost:6379/99 sentinels: - - host: slave1 + host: replica1 port: 26379 # point to sentinel, not to redis port - - host: slave2 + host: replica2 port: 26379 # point to sentinel, not to redis port diff --git a/spec/fixtures/config/redis_queues_new_format_host.yml b/spec/fixtures/config/redis_queues_new_format_host.yml index 1535584d779..bd0d82a5066 100644 --- a/spec/fixtures/config/redis_queues_new_format_host.yml +++ b/spec/fixtures/config/redis_queues_new_format_host.yml @@ -7,7 +7,7 @@ development: host: localhost port: 26381 # point to sentinel, not to redis port - - host: slave2 + host: replica2 port: 26381 # point to sentinel, not to redis port test: url: redis://:mynewpassword@localhost:6381/11 @@ -16,14 +16,14 @@ test: host: localhost port: 26381 # point to sentinel, not to redis port - - host: slave2 + host: replica2 port: 26381 # point to sentinel, not to redis port production: url: redis://:mynewpassword@localhost:6381/11 sentinels: - - host: slave1 + host: replica1 port: 26381 # point to sentinel, not to redis port - - host: slave2 + host: replica2 port: 26381 # point to sentinel, not to redis port diff --git a/spec/fixtures/config/redis_shared_state_new_format_host.yml b/spec/fixtures/config/redis_shared_state_new_format_host.yml index 1180b2b4a82..1c690567ae9 100644 --- a/spec/fixtures/config/redis_shared_state_new_format_host.yml +++ b/spec/fixtures/config/redis_shared_state_new_format_host.yml @@ -7,7 +7,7 @@ development: host: localhost port: 26382 # point to sentinel, not to redis port - - host: slave2 + host: replica2 port: 26382 # point to sentinel, not to redis port test: url: redis://:mynewpassword@localhost:6382/12 @@ -16,14 +16,14 @@ test: host: localhost port: 26382 # point to sentinel, not to redis port - - host: slave2 + host: replica2 port: 26382 # point to sentinel, not to redis port production: url: redis://:mynewpassword@localhost:6382/12 sentinels: - - host: slave1 + host: replica1 port: 26382 # point to sentinel, not to redis port - - host: slave2 + host: replica2 port: 26382 # point to sentinel, not to redis port |