1
0
Fork 0
forked from forgejo/forgejo

Use gitea forked macaron (#7933)

Signed-off-by: Tamal Saha <tamal@appscode.com>
This commit is contained in:
Tamal Saha 2019-08-23 09:40:30 -07:00 committed by techknowlogick
parent ca6fb004ac
commit 171b359877
408 changed files with 14882 additions and 13217 deletions

View file

@ -10,8 +10,8 @@ import (
"code.gitea.io/gitea/modules/log"
_ "github.com/go-macaron/cache/memcache" // memcache plugin for cache
_ "github.com/go-macaron/cache/redis"
_ "gitea.com/macaron/cache/memcache" // memcache plugin for cache
_ "gitea.com/macaron/cache/redis"
)
// Cache represents cache settings

View file

@ -9,7 +9,7 @@ import (
"code.gitea.io/gitea/modules/log"
"github.com/go-macaron/cors"
"gitea.com/macaron/cors"
)
var (
@ -28,7 +28,7 @@ func newCORSService() {
CORSConfig = cors.Options{
Scheme: sec.Key("SCHEME").String(),
AllowDomain: sec.Key("ALLOW_DOMAIN").String(),
AllowDomain: sec.Key("ALLOW_DOMAIN").Strings(","),
AllowSubdomain: sec.Key("ALLOW_SUBDOMAIN").MustBool(),
Methods: sec.Key("METHODS").Strings(","),
MaxAgeSeconds: int(maxAge.Seconds()),

View file

@ -8,6 +8,7 @@ import (
"net/mail"
"code.gitea.io/gitea/modules/log"
shellquote "github.com/kballard/go-shellquote"
)

View file

@ -10,7 +10,8 @@ import (
"strings"
"code.gitea.io/gitea/modules/log"
"github.com/Unknwon/com"
"github.com/unknwon/com"
)
// enumerates all the policy repository creating

View file

@ -12,7 +12,7 @@ import (
"code.gitea.io/gitea/modules/log"
"github.com/go-macaron/session"
"gitea.com/macaron/session"
)
var (

View file

@ -27,10 +27,10 @@ import (
_ "code.gitea.io/gitea/modules/minwinsvc" // import minwinsvc for windows services
"code.gitea.io/gitea/modules/user"
"github.com/Unknwon/cae/zip"
"github.com/Unknwon/com"
shellquote "github.com/kballard/go-shellquote"
version "github.com/mcuadros/go-version"
"github.com/unknwon/cae/zip"
"github.com/unknwon/com"
ini "gopkg.in/ini.v1"
"strk.kbt.io/projects/go/libravatar"
)