Skip to content
Snippets Groups Projects
Commit 6c3c5c10cccf authored by Balasankar 'Balu' C's avatar Balasankar 'Balu' C
Browse files

Merge branch 'ashmckenzie-master-patch-1958' into 'master'

Deprecate `gitlab_shell['migration']` omnibus setting

Closes gitlab-shell#774

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7787



Merged-by: default avatarBalasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: default avatarDustin Collins <714871-dustinmm80@users.noreply.gitlab.com>
Approved-by: default avatarBalasankar 'Balu' C <balasankar@gitlab.com>
Reviewed-by: default avatarBalasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: default avatarAsh McKenzie <amckenzie@gitlab.com>
No related branches found
No related tags found
No related merge requests found
......@@ -1349,8 +1349,7 @@
# gitlab_shell['auth_file'] = "/var/opt/gitlab/.ssh/authorized_keys"
### Migration to Go feature flags
###! Docs: https://gitlab.com/gitlab-org/gitlab-shell#migration-to-go-feature-flags
# gitlab_shell['migration'] = { enabled: true, features: [] }
# gitlab_shell['migration'] = { enabled: true, features: [] } # DEPRECATED: see https://gitlab.com/groups/gitlab-org/-/epics/14845.
### Git trace log file.
###! If set, git commands receive GIT_TRACE* environment variables
......
......@@ -343,6 +343,12 @@
deprecation: '17.1',
removal: '18.0',
note: "`registry['default_notifications_threshold'] will be removed in 18.0. Please use `default_notifications_maxretries` instead https://gitlab.com/gitlab-org/container-registry/-/issues/1243."
},
{
config_keys: %w(gitlab gitlab_shell migration),
deprecation: '17.4',
removal: '18.0',
note: "`gitlab_shell['migration'] will be ignored from 17.3 and removed in 18.0. See https://gitlab.com/groups/gitlab-org/-/epics/14845."
}
]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment