root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2023-11-09 06:11:57 +00:00
parent 1bee0901f0
commit debb5e4824
8 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/workers/environments/auto_recover_worker.rb
View File

@ -4,6 +4,7 @@ module Environments
class AutoRecoverWorker class AutoRecoverWorker
include ApplicationWorker include ApplicationWorker
deduplicate :until_executed
data_consistency :delayed data_consistency :delayed
idempotent! idempotent!
feature_category :continuous_delivery feature_category :continuous_delivery

2
config/feature_flags/development/increase_jira_import_issues_timeout.yml
View File

@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/429293
milestone: '16.6' milestone: '16.6'
type: development type: development
group: group::project management group: group::project management
default_enabled: false default_enabled: true

2
db/docs/audit_events_external_audit_event_destinations.yml
View File

@ -7,4 +7,4 @@ feature_categories:
description: TODO description: TODO
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70706 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70706
milestone: '14.4' milestone: '14.4'
gitlab_schema: gitlab_main gitlab_schema: gitlab_main_cell

2
db/docs/audit_events_google_cloud_logging_configurations.yml
View File

@ -7,4 +7,4 @@ feature_categories:
description: Stores Google Cloud Logging configurations associated with IAM service accounts, used for generating access tokens. description: Stores Google Cloud Logging configurations associated with IAM service accounts, used for generating access tokens.
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/409421 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/409421
milestone: '16.0' milestone: '16.0'
gitlab_schema: gitlab_main gitlab_schema: gitlab_main_cell

2
db/docs/protected_branch_merge_access_levels.yml
View File

@ -7,4 +7,4 @@ feature_categories:
description: Stores merge access settings for protected branches description: Stores merge access settings for protected branches
introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/5081 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/5081
milestone: '8.11' milestone: '8.11'
gitlab_schema: gitlab_main gitlab_schema: gitlab_main_cell

2
db/docs/protected_branch_push_access_levels.yml
View File

@ -7,4 +7,4 @@ feature_categories:
description: Stores push access settings for protected branches description: Stores push access settings for protected branches
introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/5081 introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/5081
milestone: '8.11' milestone: '8.11'
gitlab_schema: gitlab_main gitlab_schema: gitlab_main_cell

2
spec/lib/gitlab/database/no_cross_db_foreign_keys_spec.rb
View File

@ -28,6 +28,8 @@ RSpec.describe 'cross-database foreign keys' do
'namespace_commit_emails.user_id', # https://gitlab.com/gitlab-org/gitlab/-/issues/429804 'namespace_commit_emails.user_id', # https://gitlab.com/gitlab-org/gitlab/-/issues/429804
'path_locks.user_id', # https://gitlab.com/gitlab-org/gitlab/-/issues/429380 'path_locks.user_id', # https://gitlab.com/gitlab-org/gitlab/-/issues/429380
'project_authorizations.user_id', # https://gitlab.com/gitlab-org/gitlab/-/issues/422044 'project_authorizations.user_id', # https://gitlab.com/gitlab-org/gitlab/-/issues/422044
'protected_branch_push_access_levels.user_id', # https://gitlab.com/gitlab-org/gitlab/-/issues/431054
'protected_branch_merge_access_levels.user_id', # https://gitlab.com/gitlab-org/gitlab/-/issues/431055
'security_orchestration_policy_configurations.bot_user_id', # https://gitlab.com/gitlab-org/gitlab/-/issues/429438 'security_orchestration_policy_configurations.bot_user_id', # https://gitlab.com/gitlab-org/gitlab/-/issues/429438
'user_group_callouts.user_id' # https://gitlab.com/gitlab-org/gitlab/-/issues/421287 'user_group_callouts.user_id' # https://gitlab.com/gitlab-org/gitlab/-/issues/421287
] ]

4
spec/workers/environments/auto_recover_worker_spec.rb
View File

@ -20,6 +20,10 @@ RSpec.describe Environments::AutoRecoverWorker, feature_category: :continuous_de
project.repository.add_branch(developer, 'review/feature', 'master') project.repository.add_branch(developer, 'review/feature', 'master')
end end
it 'has the `until_executed` deduplicate strategy' do
expect(described_class.get_deduplicate_strategy).to eq(:until_executed)
end
context 'when environment has been updated recently' do context 'when environment has been updated recently' do
it 'recovers the environment' do it 'recovers the environment' do
environment.stop! environment.stop!