Merge pull request #1249 from donbowman/master
in routers/repo/download.go, don't set mime type, let go figure it out.release/v1.15
commit
3dcc0a4b5f
|
@ -198,7 +198,7 @@ func RenderRawMarkdown(body []byte, urlPrefix string) []byte {
|
||||||
extensions |= blackfriday.EXTENSION_FENCED_CODE
|
extensions |= blackfriday.EXTENSION_FENCED_CODE
|
||||||
extensions |= blackfriday.EXTENSION_AUTOLINK
|
extensions |= blackfriday.EXTENSION_AUTOLINK
|
||||||
extensions |= blackfriday.EXTENSION_STRIKETHROUGH
|
extensions |= blackfriday.EXTENSION_STRIKETHROUGH
|
||||||
extensions |= blackfriday.EXTENSION_HARD_LINE_BREAK
|
//extensions |= blackfriday.EXTENSION_HARD_LINE_BREAK
|
||||||
extensions |= blackfriday.EXTENSION_SPACE_HEADERS
|
extensions |= blackfriday.EXTENSION_SPACE_HEADERS
|
||||||
extensions |= blackfriday.EXTENSION_NO_EMPTY_LINE_BEFORE_BLOCK
|
extensions |= blackfriday.EXTENSION_NO_EMPTY_LINE_BEFORE_BLOCK
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,6 @@ func ServeBlob(ctx *middleware.Context, blob *git.Blob) error {
|
||||||
|
|
||||||
_, isTextFile := base.IsTextFile(buf)
|
_, isTextFile := base.IsTextFile(buf)
|
||||||
_, isImageFile := base.IsImageFile(buf)
|
_, isImageFile := base.IsImageFile(buf)
|
||||||
ctx.Resp.Header().Set("Content-Type", "text/plain")
|
|
||||||
if !isTextFile && !isImageFile {
|
if !isTextFile && !isImageFile {
|
||||||
ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+path.Base(ctx.Repo.TreeName))
|
ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+path.Base(ctx.Repo.TreeName))
|
||||||
ctx.Resp.Header().Set("Content-Transfer-Encoding", "binary")
|
ctx.Resp.Header().Set("Content-Transfer-Encoding", "binary")
|
||||||
|
|
Loading…
Reference in New Issue