forked from vikunja/vikunja
Fix rebase errors
This commit is contained in:
parent
93dee49b25
commit
440e0e2b27
|
@ -216,7 +216,7 @@ func RenewToken(s *xorm.Session, c echo.Context) (token string, err error) {
|
||||||
}
|
}
|
||||||
share := &models.LinkSharing{}
|
share := &models.LinkSharing{}
|
||||||
share.ID = oldShare.ID
|
share.ID = oldShare.ID
|
||||||
err = share.ReadOne(s)
|
err = share.ReadOne(s, share)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,6 +30,7 @@ import (
|
||||||
"code.vikunja.io/api/pkg/log"
|
"code.vikunja.io/api/pkg/log"
|
||||||
"code.vikunja.io/api/pkg/models"
|
"code.vikunja.io/api/pkg/models"
|
||||||
"code.vikunja.io/api/pkg/modules/auth"
|
"code.vikunja.io/api/pkg/modules/auth"
|
||||||
|
"code.vikunja.io/api/pkg/user"
|
||||||
"github.com/coreos/go-oidc"
|
"github.com/coreos/go-oidc"
|
||||||
"github.com/labstack/echo/v4"
|
"github.com/labstack/echo/v4"
|
||||||
"golang.org/x/oauth2"
|
"golang.org/x/oauth2"
|
||||||
|
|
Loading…
Reference in New Issue