mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-08-28 13:55:19 +02:00
Mirror fix
This commit is contained in:
parent
8b43bd1c37
commit
6bc7ae971a
8 changed files with 5 additions and 9 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -8,4 +8,5 @@ custom/
|
|||
data/
|
||||
.vendor/
|
||||
.idea/
|
||||
*.iml
|
||||
*.iml
|
||||
public/img/avatar/
|
|
@ -8,6 +8,7 @@ github.com/Unknwon/com=
|
|||
github.com/Unknwon/cae=
|
||||
github.com/Unknwon/goconfig=
|
||||
github.com/dchest/scrypt=
|
||||
github.com/nfnt/resize=
|
||||
github.com/lunny/xorm=
|
||||
github.com/gogits/logs=
|
||||
github.com/gogits/binding=
|
||||
|
|
|
@ -105,8 +105,6 @@ SESSION_ID_HASHKEY =
|
|||
[picture]
|
||||
; The place to picture data, either "server" or "qiniu", default is "server"
|
||||
SERVICE = server
|
||||
; For "server" only, root path of picture data, default is "data/pictures"
|
||||
PATH = data/pictures
|
||||
|
||||
[log]
|
||||
; Either "console", "file", "conn", "smtp" or "database", default is "console"
|
||||
|
|
|
@ -58,8 +58,7 @@ var (
|
|||
SessionConfig *session.Config
|
||||
SessionManager *session.Manager
|
||||
|
||||
PictureService string
|
||||
PictureRootPath string
|
||||
PictureService string
|
||||
)
|
||||
|
||||
var Service struct {
|
||||
|
@ -269,7 +268,6 @@ func NewConfigContext() {
|
|||
CookieRememberName = Cfg.MustValue("security", "COOKIE_REMEMBER_NAME")
|
||||
|
||||
PictureService = Cfg.MustValue("picture", "SERVICE")
|
||||
PictureRootPath = Cfg.MustValue("picture", "PATH")
|
||||
|
||||
// Determine and create root git reposiroty path.
|
||||
RepoRootPath = Cfg.MustValue("repository", "ROOT")
|
||||
|
|
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 6.8 KiB |
|
@ -161,7 +161,6 @@ func Config(ctx *middleware.Context) {
|
|||
ctx.Data["SessionConfig"] = base.SessionConfig
|
||||
|
||||
ctx.Data["PictureService"] = base.PictureService
|
||||
ctx.Data["PictureRootPath"] = base.PictureRootPath
|
||||
|
||||
ctx.Data["LogMode"] = base.LogMode
|
||||
ctx.Data["LogConfig"] = base.LogConfig
|
||||
|
|
|
@ -104,7 +104,6 @@
|
|||
|
||||
<div class="panel-body">
|
||||
<div><b>Picture Service:</b> {{.PictureService}}</div>
|
||||
<div><b>Picture Root Path:</b> {{.PictureRootPath}}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
2
web.go
2
web.go
|
@ -94,7 +94,7 @@ func runWeb(*cli.Context) {
|
|||
m.Get("/stars", reqSignIn, user.Stars)
|
||||
m.Get("/help", routers.Help)
|
||||
|
||||
avatarCache := avatar.HttpHandler("public/img/avatar/", "public/img/avatar/default.jpg")
|
||||
avatarCache := avatar.HttpHandler("public/img/avatar/", "public/img/avatar_default.jpg")
|
||||
m.Get("/avatar/:hash", avatarCache.ServeHTTP)
|
||||
|
||||
m.Group("/user", func(r martini.Router) {
|
||||
|
|
Loading…
Reference in a new issue