VladPolskiy/gitlabhq
1
0
Fork 0
mirror of https://github.com/gitlabhq/gitlabhq.git synced 2025-07-25 17:08:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add latest changes from gitlab-org/gitlab@master

Browse Source
This commit is contained in:
GitLab Bot
2023-08-01 06:07:01 +00:00
parent 0548fa3575
commit adc17b84d1
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.rubocop_todo/rspec/factory_bot/excessive_create_list.yml
View File

@ -14,11 +14,8 @@ RSpec/FactoryBot/ExcessiveCreateList:
- 'ee/spec/support/protected_tags/access_control_shared_examples.rb'
- 'ee/spec/support/shared_examples/features/protected_branches_access_control_shared_examples.rb'
- 'ee/spec/views/admin/application_settings/_elasticsearch_form.html.haml_spec.rb'
- 'spec/controllers/admin/clusters_controller_spec.rb'
- 'spec/controllers/autocomplete_controller_spec.rb'
- 'spec/controllers/explore/projects_controller_spec.rb'
- 'spec/controllers/groups/clusters_controller_spec.rb'
- 'spec/controllers/projects/clusters_controller_spec.rb'
- 'spec/controllers/projects/feature_flags_controller_spec.rb'
- 'spec/controllers/projects/hooks_controller_spec.rb'
- 'spec/docs_screenshots/container_registry_docs.rb'

2
GITLAB_PAGES_VERSION
View File

@ -1 +1 @@
2a21892c80bd3b229073f091206247af66344dbe
86dd2da4f0880e53cd987ab392173cd2c08aba00

3
spec/controllers/admin/clusters_controller_spec.rb
View File

@ -58,7 +58,8 @@ RSpec.describe Admin::ClustersController, feature_category: :deployment_manageme
let(:total_count) { Clusters::Cluster.instance_type.page.total_count }
before do
create_list(:cluster, 30, :provided_by_gcp, :production_environment, :instance)
allow(Clusters::Cluster).to receive(:default_per_page).and_return(1)
create_list(:cluster, 2, :provided_by_gcp, :production_environment, :instance)
end
it 'redirects to the page' do

3
spec/controllers/groups/clusters_controller_spec.rb
View File

@ -63,7 +63,8 @@ RSpec.describe Groups::ClustersController, feature_category: :deployment_managem
let(:total_count) { group.clusters.page.total_count }
before do
create_list(:cluster, 30, :provided_by_gcp, :production_environment, cluster_type: :group_type, groups: [group])
allow(Clusters::Cluster).to receive(:default_per_page).and_return(1)
create_list(:cluster, 2, :provided_by_gcp, :production_environment, cluster_type: :group_type, groups: [group])
end
it 'redirects to the page' do

3
spec/controllers/projects/clusters_controller_spec.rb
View File

@ -57,7 +57,8 @@ RSpec.describe Projects::ClustersController, feature_category: :deployment_manag
let(:total_count) { project.clusters.page.total_count }
before do
create_list(:cluster, 30, :provided_by_gcp, :production_environment, projects: [project])
allow(Clusters::Cluster).to receive(:default_per_page).and_return(1)
create_list(:cluster, 2, :provided_by_gcp, :production_environment, projects: [project])
end
it 'redirects to the page' do