diff options
| author | Antoine GIRARD <sapk@users.noreply.github.com> | 2017-04-26 15:10:43 +0200 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2017-04-26 21:10:43 +0800 |
| commit | 8371f94d06cefbd65392af3b5c0f1fd1057429f7 (patch) | |
| tree | d6bf49ee4406be76e5429bc70da4a5dee22e3cab /routers/routes | |
| parent | b7da5a6cb7c725232c1053a1ca705a6ac0dad467 (diff) | |
| download | gitea-8371f94d06cefbd65392af3b5c0f1fd1057429f7.tar.gz gitea-8371f94d06cefbd65392af3b5c0f1fd1057429f7.zip | |
Rework SSH key management UI to add GPG (#1293)
* Rework SSH key management UI to add GPG
* Add more detail to gpg key display
* Update CHANGELOG.md
* Implement deletion UI
* Implement adding gpg UI
* Various fixes
- Fix duplicate entry in locale
- Re-generate hash before verification since they are consumed
* Add missing translation
* Split template
* Catch not found/verified email error
Diffstat (limited to 'routers/routes')
| -rw-r--r-- | routers/routes/routes.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/routers/routes/routes.go b/routers/routes/routes.go index a28473c0e4..0920ef03b2 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -214,9 +214,9 @@ func RegisterRoutes(m *macaron.Macaron) { }) } - m.Combo("/ssh").Get(user.SettingsSSHKeys). - Post(bindIgnErr(auth.AddSSHKeyForm{}), user.SettingsSSHKeysPost) - m.Post("/ssh/delete", user.DeleteSSHKey) + m.Combo("/keys").Get(user.SettingsKeys). + Post(bindIgnErr(auth.AddKeyForm{}), user.SettingsKeysPost) + m.Post("/keys/delete", user.DeleteKey) m.Combo("/applications").Get(user.SettingsApplications). Post(bindIgnErr(auth.NewAccessTokenForm{}), user.SettingsApplicationsPost) m.Post("/applications/delete", user.SettingsDeleteApplication) @@ -438,7 +438,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Group("/keys", func() { m.Combo("").Get(repo.DeployKeys). - Post(bindIgnErr(auth.AddSSHKeyForm{}), repo.DeployKeysPost) + Post(bindIgnErr(auth.AddKeyForm{}), repo.DeployKeysPost) m.Post("/delete", repo.DeleteDeployKey) }) |