git724/forgejo
1
0
Fork 0
Code Issues Pull requests 3 Projects 1 Releases Packages Wiki Activity

refactor: err != nil check, just return error instead (#5093)

Browse source
This commit is contained in:
Bo-Yi Wu 2018-10-18 12:51:07 +08:00 • committed by techknowlogick
commit 1e34413238
2 changed files with 5 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

19
cmd/admin.go
View file

@ -412,16 +412,12 @@ func runAddOauth(c *cli.Context) error {
return err
}
if err := models.CreateLoginSource(&models.LoginSource{
return models.CreateLoginSource(&models.LoginSource{
Type: models.LoginOAuth2,
Name: c.String("name"),
IsActived: true,
Cfg: parseOAuth2Config(c),
}); err != nil {
return err
}
return nil
})
}
func runUpdateOauth(c *cli.Context) error {
@ -492,11 +488,7 @@ func runUpdateOauth(c *cli.Context) error {
oAuth2Config.CustomURLMapping = customURLMapping
source.Cfg = oAuth2Config
if err := models.UpdateSource(source); err != nil {
return err
}
return nil
return models.UpdateSource(source)
}
func runListAuth(c *cli.Context) error {
@ -543,8 +535,5 @@ func runDeleteAuth(c *cli.Context) error {
return err
}
if err = models.DeleteSource(source); err != nil {
return err
}
return nil
return models.DeleteSource(source)
}

5
models/migrations/v68.go
View file

@ -205,9 +205,6 @@ func reformatAndRemoveIncorrectTopics(x *xorm.Engine) (err error) {
return err
}
}
if err := sess.Commit(); err != nil {
return err
}
return nil
return sess.Commit()
}