Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
a9a25b9e72
commit
d27c7afb79
8 changed files with 8 additions and 25 deletions
|
@ -18,6 +18,7 @@
|
|||
/doc/administration/monitoring/ @ngaskill
|
||||
/doc/administration/operations/ @axil @eread @marcia
|
||||
/doc/administration/packages/ @ngaskill
|
||||
/doc/administration/pages/ @axil @kpaizee
|
||||
/doc/administration/postgresql/ @marcia
|
||||
/doc/administration/raketasks/ @axil @eread
|
||||
/doc/administration/redis/ @axil
|
||||
|
|
|
@ -94,7 +94,6 @@ cloud "**Object Storage**" as object_storage #white
|
|||
elb -[#6a9be7]-> gitlab
|
||||
elb -[#6a9be7]--> monitor
|
||||
|
||||
gitlab -[#32CD32]> sidekiq
|
||||
gitlab -[#32CD32]--> ilb
|
||||
gitlab -[#32CD32]-> object_storage
|
||||
gitlab -[#32CD32]---> redis
|
||||
|
@ -2485,7 +2484,6 @@ elb -[#6a9be7]-> gitlab
|
|||
elb -[#6a9be7]-> monitor
|
||||
elb -[hidden]-> support
|
||||
|
||||
gitlab -[#32CD32]> sidekiq
|
||||
gitlab -[#32CD32]--> ilb
|
||||
gitlab -[#32CD32]-> object_storage
|
||||
gitlab -[#32CD32]---> redis
|
||||
|
|
|
@ -94,7 +94,6 @@ cloud "**Object Storage**" as object_storage #white
|
|||
elb -[#6a9be7]-> gitlab
|
||||
elb -[#6a9be7]--> monitor
|
||||
|
||||
gitlab -[#32CD32]> sidekiq
|
||||
gitlab -[#32CD32]--> ilb
|
||||
gitlab -[#32CD32]-> object_storage
|
||||
gitlab -[#32CD32]---> redis
|
||||
|
@ -2497,7 +2496,6 @@ elb -[#6a9be7]-> gitlab
|
|||
elb -[#6a9be7]-> monitor
|
||||
elb -[hidden]-> support
|
||||
|
||||
gitlab -[#32CD32]> sidekiq
|
||||
gitlab -[#32CD32]--> ilb
|
||||
gitlab -[#32CD32]-> object_storage
|
||||
gitlab -[#32CD32]---> redis
|
||||
|
|
|
@ -101,7 +101,6 @@ cloud "**Object Storage**" as object_storage #white
|
|||
elb -[#6a9be7]-> gitlab
|
||||
elb -[#6a9be7]--> monitor
|
||||
|
||||
gitlab -[#32CD32]> sidekiq
|
||||
gitlab -[#32CD32]--> ilb
|
||||
gitlab -[#32CD32]-> object_storage
|
||||
gitlab -[#32CD32]---> redis
|
||||
|
|
|
@ -94,7 +94,6 @@ cloud "**Object Storage**" as object_storage #white
|
|||
elb -[#6a9be7]-> gitlab
|
||||
elb -[#6a9be7]--> monitor
|
||||
|
||||
gitlab -[#32CD32]> sidekiq
|
||||
gitlab -[#32CD32]--> ilb
|
||||
gitlab -[#32CD32]-> object_storage
|
||||
gitlab -[#32CD32]---> redis
|
||||
|
@ -2508,7 +2507,6 @@ elb -[#6a9be7]-> gitlab
|
|||
elb -[#6a9be7]-> monitor
|
||||
elb -[hidden]-> support
|
||||
|
||||
gitlab -[#32CD32]> sidekiq
|
||||
gitlab -[#32CD32]--> ilb
|
||||
gitlab -[#32CD32]-> object_storage
|
||||
gitlab -[#32CD32]---> redis
|
||||
|
|
|
@ -96,7 +96,6 @@ cloud "**Object Storage**" as object_storage #white
|
|||
elb -[#6a9be7]-> gitlab
|
||||
elb -[#6a9be7]--> monitor
|
||||
|
||||
gitlab -[#32CD32]> sidekiq
|
||||
gitlab -[#32CD32]--> ilb
|
||||
gitlab -[#32CD32]-> object_storage
|
||||
gitlab -[#32CD32]---> redis
|
||||
|
@ -2186,7 +2185,6 @@ elb -[#6a9be7]-> gitlab
|
|||
elb -[#6a9be7]-> monitor
|
||||
elb -[hidden]-> support
|
||||
|
||||
gitlab -[#32CD32]> sidekiq
|
||||
gitlab -[#32CD32]--> ilb
|
||||
gitlab -[#32CD32]-> object_storage
|
||||
gitlab -[#32CD32]---> redis
|
||||
|
|
|
@ -70,6 +70,9 @@ NOTE:
|
|||
Since file system performance may affect the overall performance of GitLab,
|
||||
[we don't recommend using cloud-based file systems for storage](../administration/nfs.md#avoid-using-cloud-based-file-systems).
|
||||
|
||||
NOTE:
|
||||
[NFS for Git repository storage is deprecated](https://about.gitlab.com/releases/2021/06/22/gitlab-14-0-released/#nfs-for-git-repository-storage-deprecated). See our official [Statement of Support](https://about.gitlab.com/support/statement-of-support.html#gitaly-and-nfs) for further information.
|
||||
|
||||
### CPU
|
||||
|
||||
CPU requirements are dependent on the number of users and expected workload. Your exact needs may be more, depending on your workload. Your workload is influenced by factors such as - but not limited to - how active your users are, how much automation you use, mirroring, and repository/change size.
|
||||
|
|
|
@ -67,10 +67,7 @@ RSpec.shared_examples 'issuable import csv service' do |issuable_type|
|
|||
it 'correctly sets the issuable attributes' do
|
||||
expect { subject }.to change { issuables.count }.by 4
|
||||
|
||||
expect(issuables.reload.last).to have_attributes(
|
||||
title: 'Test Title',
|
||||
description: 'Test Description'
|
||||
)
|
||||
expect(issuables.reload).to include(have_attributes({ title: 'Test Title', description: 'Test Description' }))
|
||||
end
|
||||
|
||||
it_behaves_like 'importer with email notification'
|
||||
|
@ -89,10 +86,7 @@ RSpec.shared_examples 'issuable import csv service' do |issuable_type|
|
|||
it 'correctly sets the issuable attributes' do
|
||||
expect { subject }.to change { issuables.count }.by 3
|
||||
|
||||
expect(issuables.reload.last).to have_attributes(
|
||||
title: 'Title with quote"',
|
||||
description: 'Description'
|
||||
)
|
||||
expect(issuables.reload).to include(have_attributes(title: 'Title with quote"', description: 'Description'))
|
||||
end
|
||||
|
||||
it_behaves_like 'importer with email notification'
|
||||
|
@ -111,10 +105,7 @@ RSpec.shared_examples 'issuable import csv service' do |issuable_type|
|
|||
it 'correctly sets the issuable attributes' do
|
||||
expect { subject }.to change { issuables.count }.by 2
|
||||
|
||||
expect(issuables.reload.last).to have_attributes(
|
||||
title: 'Hello',
|
||||
description: 'World'
|
||||
)
|
||||
expect(issuables.reload).to include(have_attributes(title: 'Hello', description: 'World'))
|
||||
end
|
||||
|
||||
it_behaves_like 'importer with email notification'
|
||||
|
@ -133,10 +124,7 @@ RSpec.shared_examples 'issuable import csv service' do |issuable_type|
|
|||
it 'correctly sets the issuable attributes' do
|
||||
expect { subject }.to change { issuables.count }.by 3
|
||||
|
||||
expect(issuables.reload.last).to have_attributes(
|
||||
title: 'Hello',
|
||||
description: 'World'
|
||||
)
|
||||
expect(issuables.reload).to include(have_attributes(title: 'Hello', description: 'World'))
|
||||
end
|
||||
|
||||
it_behaves_like 'importer with email notification'
|
||||
|
|
Loading…
Reference in a new issue