summaryrefslogtreecommitdiffstats
path: root/routers/web/user
diff options
context:
space:
mode:
authorHester Gong <hestergong@gmail.com>2023-04-28 08:08:47 +0800
committerGitHub <noreply@github.com>2023-04-27 20:08:47 -0400
commit63a401ac40ce2cc19c7d0341d11d434b568653fc (patch)
tree0db5d52b2ea9645cf97a7ab6dd410727dece4a36 /routers/web/user
parent6dfc0c87ec4fc20213025d72928320222af3a785 (diff)
downloadgitea-63a401ac40ce2cc19c7d0341d11d434b568653fc.tar.gz
gitea-63a401ac40ce2cc19c7d0341d11d434b568653fc.zip
Move secrets and runners settings to actions settings (#24200)
This PR moves the secrets and runners settings to actions settings on all settings(repo,org,user,admin) levels. After this PR, if [ENABLED](https://github.com/go-gitea/gitea/blob/5e7543fcf441afb30aba6188edac754ef32b9ac3/custom/conf/app.example.ini#L2604) inside `app.ini` under `[actions]` is set to `false`, the "Actions" tab (including runners management and secrets management) will not be shown. After, the settings under actions settings for each level: 1. Admin Level "Runners Management" <img width="1437" alt="Screen Shot 2023-04-26 at 14 34 20" src="https://user-images.githubusercontent.com/17645053/234489731-15822d21-38e1-4560-8bbe-69f122376abc.png"> 2. User Level "Secrets Management" <img width="1427" alt="Screen Shot 2023-04-26 at 14 34 30" src="https://user-images.githubusercontent.com/17645053/234489795-68c9c0cb-24f8-4f09-95c6-458ab914c313.png"> 3. Repo and Organization Levels "Runners Management" and "Secrets Management" Org: <img width="1437" alt="Screen Shot 2023-04-26 at 14 35 07" src="https://user-images.githubusercontent.com/17645053/234489996-f3af5ebb-d354-46ca-9087-a0b586845281.png"> <img width="1433" alt="Screen Shot 2023-04-26 at 14 35 14" src="https://user-images.githubusercontent.com/17645053/234490004-3abf8fed-81fd-4ce2-837a-935dade1793d.png"> Repo: <img width="1419" alt="Screen Shot 2023-04-26 at 14 34 50" src="https://user-images.githubusercontent.com/17645053/234489904-80c11038-4b58-462c-9d0b-8b7cf70bc2b3.png"> <img width="1430" alt="Screen Shot 2023-04-26 at 14 34 57" src="https://user-images.githubusercontent.com/17645053/234489918-4e8d1fe2-9bcd-4d8a-96c1-238a8088d92e.png"> It also finished these tasks : - [x] rename routers function "runners" to "actions", and refactor related file names - [x] check and modify part of the runners related functions to match their name - [x] Fix backend check caused by fmt check --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Diffstat (limited to 'routers/web/user')
-rw-r--r--routers/web/user/setting/secrets.go38
1 files changed, 2 insertions, 36 deletions
diff --git a/routers/web/user/setting/secrets.go b/routers/web/user/setting/secrets.go
index 2314f3694f..eb09477bdb 100644
--- a/routers/web/user/setting/secrets.go
+++ b/routers/web/user/setting/secrets.go
@@ -4,44 +4,10 @@
package setting
import (
- "net/http"
-
- "code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/setting"
- shared "code.gitea.io/gitea/routers/web/shared/secrets"
-)
-
-const (
- tplSettingsSecrets base.TplName = "user/settings/secrets"
)
-func Secrets(ctx *context.Context) {
- ctx.Data["Title"] = ctx.Tr("secrets.secrets")
- ctx.Data["PageIsSettingsSecrets"] = true
-
- shared.SetSecretsContext(ctx, ctx.Doer.ID, 0)
- if ctx.Written() {
- return
- }
-
- ctx.HTML(http.StatusOK, tplSettingsSecrets)
-}
-
-func SecretsPost(ctx *context.Context) {
- shared.PerformSecretsPost(
- ctx,
- ctx.Doer.ID,
- 0,
- setting.AppSubURL+"/user/settings/secrets",
- )
-}
-
-func SecretsDelete(ctx *context.Context) {
- shared.PerformSecretsDelete(
- ctx,
- ctx.Doer.ID,
- 0,
- setting.AppSubURL+"/user/settings/secrets",
- )
+func RedirectToDefaultSetting(ctx *context.Context) {
+ ctx.Redirect(setting.AppSubURL + "/user/settings/actions/secrets")
}