aboutsummaryrefslogtreecommitdiffstats
path: root/models/gpg_key_add.go
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2021-09-23 16:45:36 +0100
committerGitHub <noreply@github.com>2021-09-23 23:45:36 +0800
commit9302eba971611601c3ebf6024e22a11c63f4e151 (patch)
treea3e5583986161ef62e7affc694098279ecf2217d /models/gpg_key_add.go
parentb22be7f594401d7bd81196750456ce52185bd391 (diff)
downloadgitea-9302eba971611601c3ebf6024e22a11c63f4e151.tar.gz
gitea-9302eba971611601c3ebf6024e22a11c63f4e151.zip
DBContext is just a Context (#17100)
* DBContext is just a Context This PR removes some of the specialness from the DBContext and makes it context This allows us to simplify the GetEngine code to wrap around any context in future and means that we can change our loadRepo(e Engine) functions to simply take contexts. Signed-off-by: Andrew Thornton <art27@cantab.net> * fix unit tests Signed-off-by: Andrew Thornton <art27@cantab.net> * another place that needs to set the initial context Signed-off-by: Andrew Thornton <art27@cantab.net> * avoid race Signed-off-by: Andrew Thornton <art27@cantab.net> * change attachment error Signed-off-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'models/gpg_key_add.go')
-rw-r--r--models/gpg_key_add.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/models/gpg_key_add.go b/models/gpg_key_add.go
index 91a30120a6..635872c920 100644
--- a/models/gpg_key_add.go
+++ b/models/gpg_key_add.go
@@ -103,7 +103,7 @@ func AddGPGKey(ownerID int64, content, token, signature string) ([]*GPGKey, erro
for _, ekey := range ekeys {
// Key ID cannot be duplicated.
- has, err := ctx.Engine().Where("key_id=?", ekey.PrimaryKey.KeyIdString()).
+ has, err := db.GetEngine(ctx).Where("key_id=?", ekey.PrimaryKey.KeyIdString()).
Get(new(GPGKey))
if err != nil {
return nil, err
@@ -118,7 +118,7 @@ func AddGPGKey(ownerID int64, content, token, signature string) ([]*GPGKey, erro
return nil, err
}
- if err = addGPGKey(ctx.Engine(), key, content); err != nil {
+ if err = addGPGKey(db.GetEngine(ctx), key, content); err != nil {
return nil, err
}
keys = append(keys, key)