diff options
| author | Tamal Saha <tamal@appscode.com> | 2019-08-23 09:40:30 -0700 |
|---|---|---|
| committer | techknowlogick <techknowlogick@gitea.io> | 2019-08-23 12:40:29 -0400 |
| commit | 171b3598778a1ecd0a921c71ed6755bfef68f7f0 (patch) | |
| tree | 02857629ef9e8e26ee0ee559153f803f77b588b7 /modules/setting | |
| parent | ca6fb004ac50fc924861112403895d637c6a2d1d (diff) | |
| download | gitea-171b3598778a1ecd0a921c71ed6755bfef68f7f0.tar.gz gitea-171b3598778a1ecd0a921c71ed6755bfef68f7f0.zip | |
Use gitea forked macaron (#7933)
Signed-off-by: Tamal Saha <tamal@appscode.com>
Diffstat (limited to 'modules/setting')
| -rw-r--r-- | modules/setting/cache.go | 4 | ||||
| -rw-r--r-- | modules/setting/cors.go | 4 | ||||
| -rw-r--r-- | modules/setting/mailer.go | 1 | ||||
| -rw-r--r-- | modules/setting/repository.go | 3 | ||||
| -rw-r--r-- | modules/setting/session.go | 2 | ||||
| -rw-r--r-- | modules/setting/setting.go | 4 |
6 files changed, 10 insertions, 8 deletions
diff --git a/modules/setting/cache.go b/modules/setting/cache.go index 1f79404e00..7be24b865f 100644 --- a/modules/setting/cache.go +++ b/modules/setting/cache.go @@ -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 diff --git a/modules/setting/cors.go b/modules/setting/cors.go index c1c3bfb813..04f3120536 100644 --- a/modules/setting/cors.go +++ b/modules/setting/cors.go @@ -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()), diff --git a/modules/setting/mailer.go b/modules/setting/mailer.go index 3101ed5452..c692e0fe14 100644 --- a/modules/setting/mailer.go +++ b/modules/setting/mailer.go @@ -8,6 +8,7 @@ import ( "net/mail" "code.gitea.io/gitea/modules/log" + shellquote "github.com/kballard/go-shellquote" ) diff --git a/modules/setting/repository.go b/modules/setting/repository.go index 98e3d6e826..728741576d 100644 --- a/modules/setting/repository.go +++ b/modules/setting/repository.go @@ -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 diff --git a/modules/setting/session.go b/modules/setting/session.go index bed3a9d8c0..6e5a28bb75 100644 --- a/modules/setting/session.go +++ b/modules/setting/session.go @@ -12,7 +12,7 @@ import ( "code.gitea.io/gitea/modules/log" - "github.com/go-macaron/session" + "gitea.com/macaron/session" ) var ( diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 97db7eaf9e..123aa8f103 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -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" ) |