Merge branch 'ashmckenzie/allow-pure-ssh-lfs-to-be-set' into 'main'

Igor Drozdov · ashmckenzie · GitLab · commit d7504d8c204b · 2024-06-30T22:28:26.000Z
Allow pure_ssh_protocol to be set See merge request https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/1093 Merged-by: Igor Drozdov <idrozdov@gitlab.com> Approved-by: Javiera Tapia <jtapia@gitlab.com> Approved-by: Igor Drozdov <idrozdov@gitlab.com> Co-authored-by: Ash McKenzie <amckenzie@gitlab.com>
diff --git a/internal/config/config.go b/internal/config/config.go
@@ -61,8 +61,7 @@ type HttpSettingsConfig struct {
 }
 
 type LFSConfig struct {
-	// FIXME: Let's not allow this to be set in config.yml
-	PureSSHProtocol bool // `yaml:"pure_ssh_protocol"`
+	PureSSHProtocol bool `yaml:"pure_ssh_protocol"`
 }
 
 type PATConfig struct {

Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,7 @@ type HttpSettingsConfig struct {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`type LFSConfig struct {`
`64`		`- // FIXME: Let's not allow this to be set in config.yml`
`65`		- PureSSHProtocol bool // `yaml:"pure_ssh_protocol"`
	`64`	+ PureSSHProtocol bool `yaml:"pure_ssh_protocol"`
`66`	`65`	`}`
`67`	`66`
`68`	`67`	`type PATConfig struct {`