`Secrets` options should be hidden if `Actions` feature is disabled. This fixes in release/v1.19. In main probably fixed intags/v1.19.463a401ac40
(didn't check). Fixes:659055138b
Author-Change-Id: IB#1134011 Signed-off-by: Pawel Boguslawski <pawel.boguslawski@ib.pl>
@@ -479,7 +479,7 @@ func RegisterRoutes(m *web.Route) { | |||
m.Get("", user_setting.Secrets) | |||
m.Post("", web.Bind(forms.AddSecretForm{}), user_setting.SecretsPost) | |||
m.Post("/delete", user_setting.SecretsDelete) | |||
}) | |||
}, actions.MustEnableActions) | |||
m.Get("/organization", user_setting.Organization) | |||
m.Get("/repos", user_setting.Repos) | |||
m.Post("/repos/unadopted", user_setting.AdoptOrDeleteRepository) | |||
@@ -853,7 +853,7 @@ func RegisterRoutes(m *web.Route) { | |||
m.Get("", org.Secrets) | |||
m.Post("", web.Bind(forms.AddSecretForm{}), org.SecretsPost) | |||
m.Post("/delete", org.SecretsDelete) | |||
}) | |||
}, actions.MustEnableActions) | |||
m.Route("/delete", "GET,POST", org.SettingsDelete) | |||
@@ -1044,7 +1044,7 @@ func RegisterRoutes(m *web.Route) { | |||
m.Get("", repo.Secrets) | |||
m.Post("", web.Bind(forms.AddSecretForm{}), repo.SecretsPost) | |||
m.Post("/delete", repo.DeleteSecret) | |||
}) | |||
}, actions.MustEnableActions) | |||
m.Group("/lfs", func() { | |||
m.Get("/", repo.LFSFiles) |
@@ -12,9 +12,11 @@ | |||
<a class="{{if .PageIsOrgSettingsLabels}}active {{end}}item" href="{{.OrgLink}}/settings/labels"> | |||
{{.locale.Tr "repo.labels"}} | |||
</a> | |||
{{if .EnableActions}} | |||
<a class="{{if .PageIsOrgSettingsSecrets}}active {{end}}item" href="{{.OrgLink}}/settings/secrets"> | |||
{{.locale.Tr "secrets.secrets"}} | |||
</a> | |||
{{end}} | |||
{{if .EnableOAuth2}} | |||
<a class="{{if .PageIsSettingsApplications}}active {{end}}item" href="{{.OrgLink}}/settings/applications"> | |||
{{.locale.Tr "settings.applications"}} |
@@ -13,7 +13,9 @@ | |||
<li {{if .PageIsSettingsGitHooks}}class="current"{{end}}><a href="{{.RepoLink}}/settings/hooks/git">{{.locale.Tr "repo.settings.githooks"}}</a></li> | |||
{{end}} | |||
<li {{if .PageIsSettingsKeys}}class="current"{{end}}><a href="{{.RepoLink}}/settings/keys">{{.locale.Tr "repo.settings.deploy_keys"}}</a></li> | |||
{{if .EnableActions}} | |||
<li {{if .PageIsSettingsSecrets}}class="current"{{end}}><a href="{{.RepoLink}}/settings/secrets">{{.locale.Tr "secrets.secrets"}}</a></li> | |||
{{end}} | |||
</ul> | |||
</div> | |||
</div> |
@@ -27,9 +27,11 @@ | |||
<a class="{{if .PageIsSettingsKeys}}active {{end}}item" href="{{.RepoLink}}/settings/keys"> | |||
{{.locale.Tr "repo.settings.deploy_keys"}} | |||
</a> | |||
{{if .EnableActions}} | |||
<a class="{{if .PageIsSettingsSecrets}}active {{end}}item" href="{{.RepoLink}}/settings/secrets"> | |||
{{.locale.Tr "secrets.secrets"}} | |||
</a> | |||
{{end}} | |||
{{if .LFSStartServer}} | |||
<a class="{{if .PageIsSettingsLFS}}active {{end}}item" href="{{.RepoLink}}/settings/lfs"> | |||
{{.locale.Tr "repo.settings.lfs"}} |
@@ -18,9 +18,11 @@ | |||
<a class="{{if .PageIsSettingsKeys}}active {{end}}item" href="{{AppSubUrl}}/user/settings/keys"> | |||
{{.locale.Tr "settings.ssh_gpg_keys"}} | |||
</a> | |||
{{if .EnableActions}} | |||
<a class="{{if .PageIsSettingsSecrets}}active {{end}}item" href="{{AppSubUrl}}/user/settings/secrets"> | |||
{{.locale.Tr "secrets.secrets"}} | |||
</a> | |||
{{end}} | |||
{{if .EnablePackages}} | |||
<a class="{{if .PageIsSettingsPackages}}active {{end}}item" href="{{AppSubUrl}}/user/settings/packages"> | |||
{{.locale.Tr "packages.title"}} |