Allow custom public files (#782)
* Allow custom public files * Gofmt code, lots of places not related to this pr
This commit is contained in:
parent
cc31a21192
commit
78535fb08e
7 changed files with 26 additions and 6 deletions
|
@ -88,6 +88,11 @@ func newMacaron() *macaron.Macaron {
|
|||
if setting.Protocol == setting.FCGI {
|
||||
m.SetURLPrefix(setting.AppSubURL)
|
||||
}
|
||||
m.Use(public.Custom(
|
||||
&public.Options{
|
||||
SkipLogging: setting.DisableRouterLog,
|
||||
},
|
||||
))
|
||||
m.Use(public.Static(
|
||||
&public.Options{
|
||||
Directory: path.Join(setting.StaticRootPath, "public"),
|
||||
|
|
|
@ -31,7 +31,6 @@ type Attachment struct {
|
|||
CreatedUnix int64
|
||||
}
|
||||
|
||||
|
||||
// BeforeInsert is invoked from XORM before inserting an object of this type.
|
||||
func (a *Attachment) BeforeInsert() {
|
||||
a.CreatedUnix = time.Now().Unix()
|
||||
|
|
|
@ -14,6 +14,7 @@ import (
|
|||
"time"
|
||||
|
||||
"code.gitea.io/git"
|
||||
"code.gitea.io/gitea/modules/base"
|
||||
"code.gitea.io/gitea/modules/log"
|
||||
"code.gitea.io/gitea/modules/process"
|
||||
"code.gitea.io/gitea/modules/setting"
|
||||
|
@ -21,7 +22,6 @@ import (
|
|||
api "code.gitea.io/sdk/gitea"
|
||||
"github.com/Unknwon/com"
|
||||
"github.com/go-xorm/xorm"
|
||||
"code.gitea.io/gitea/modules/base"
|
||||
)
|
||||
|
||||
var pullRequestQueue = sync.NewUniqueQueue(setting.Repository.PullRequestQueueLength)
|
||||
|
|
|
@ -4,6 +4,13 @@
|
|||
|
||||
package public
|
||||
|
||||
import (
|
||||
"path"
|
||||
|
||||
"code.gitea.io/gitea/modules/setting"
|
||||
"gopkg.in/macaron.v1"
|
||||
)
|
||||
|
||||
//go:generate go-bindata -tags "bindata" -ignore "\\.go|\\.less" -pkg "public" -o "bindata.go" ../../public/...
|
||||
//go:generate go fmt bindata.go
|
||||
//go:generate sed -i.bak s/..\/..\/public\/// bindata.go
|
||||
|
@ -14,3 +21,13 @@ type Options struct {
|
|||
Directory string
|
||||
SkipLogging bool
|
||||
}
|
||||
|
||||
// Custom implements the macaron static handler for serving custom assets.
|
||||
func Custom(opts *Options) macaron.Handler {
|
||||
return macaron.Static(
|
||||
path.Join(setting.CustomPath, "public"),
|
||||
macaron.StaticOptions{
|
||||
SkipLogging: opts.SkipLogging,
|
||||
},
|
||||
)
|
||||
}
|
||||
|
|
|
@ -12,13 +12,13 @@ import (
|
|||
"code.gitea.io/gitea/models"
|
||||
"code.gitea.io/gitea/modules/cron"
|
||||
"code.gitea.io/gitea/modules/highlight"
|
||||
"code.gitea.io/gitea/modules/indexer"
|
||||
"code.gitea.io/gitea/modules/log"
|
||||
"code.gitea.io/gitea/modules/mailer"
|
||||
"code.gitea.io/gitea/modules/markdown"
|
||||
"code.gitea.io/gitea/modules/setting"
|
||||
"code.gitea.io/gitea/modules/ssh"
|
||||
macaron "gopkg.in/macaron.v1"
|
||||
"code.gitea.io/gitea/modules/indexer"
|
||||
)
|
||||
|
||||
func checkRunMode() {
|
||||
|
|
|
@ -70,4 +70,3 @@ func UploadAttachment(ctx *context.Context) {
|
|||
"uuid": attach.UUID,
|
||||
})
|
||||
}
|
||||
|
||||
|
|
|
@ -169,7 +169,7 @@ func NewRelease(ctx *context.Context) {
|
|||
ctx.Data["Title"] = ctx.Tr("repo.release.new_release")
|
||||
ctx.Data["PageIsReleaseList"] = true
|
||||
ctx.Data["tag_target"] = ctx.Repo.Repository.DefaultBranch
|
||||
renderAttachmentSettings(ctx);
|
||||
renderAttachmentSettings(ctx)
|
||||
ctx.HTML(200, tplReleaseNew)
|
||||
}
|
||||
|
||||
|
@ -250,7 +250,7 @@ func EditRelease(ctx *context.Context) {
|
|||
ctx.Data["Title"] = ctx.Tr("repo.release.edit_release")
|
||||
ctx.Data["PageIsReleaseList"] = true
|
||||
ctx.Data["PageIsEditRelease"] = true
|
||||
renderAttachmentSettings(ctx);
|
||||
renderAttachmentSettings(ctx)
|
||||
|
||||
tagName := ctx.Params("*")
|
||||
rel, err := models.GetRelease(ctx.Repo.Repository.ID, tagName)
|
||||
|
|
Loading…
Reference in a new issue