summaryrefslogtreecommitdiffstats
path: root/routers
diff options
context:
space:
mode:
authorJohn Olheiser <42128690+jolheiser@users.noreply.github.com>2019-12-17 21:59:59 -0600
committertechknowlogick <techknowlogick@gitea.io>2019-12-17 22:59:59 -0500
commitba8f93a14e7db45ca02b1d0b486aab0d8da07c96 (patch)
tree678c2d93ddba6fd0e4549d86252bf4e7494e5b15 /routers
parent590d56dbb355a499b2f59d9a6ffa4887ea33c96b (diff)
downloadgitea-ba8f93a14e7db45ca02b1d0b486aab0d8da07c96.tar.gz
gitea-ba8f93a14e7db45ca02b1d0b486aab0d8da07c96.zip
Fix some SimpleMDE (#9400)
Signed-off-by: jolheiser <john.olheiser@gmail.com>
Diffstat (limited to 'routers')
-rw-r--r--routers/repo/editor.go2
-rw-r--r--routers/repo/pull.go1
2 files changed, 3 insertions, 0 deletions
diff --git a/routers/repo/editor.go b/routers/repo/editor.go
index 763429f8cf..fec5728525 100644
--- a/routers/repo/editor.go
+++ b/routers/repo/editor.go
@@ -458,6 +458,8 @@ func DeleteFilePost(ctx *context.Context, form auth.DeleteRepoFileForm) {
func renderUploadSettings(ctx *context.Context) {
ctx.Data["RequireDropzone"] = true
+ ctx.Data["RequireTribute"] = true
+ ctx.Data["RequireSimpleMDE"] = true
ctx.Data["UploadAllowedTypes"] = strings.Join(setting.Repository.Upload.AllowedTypes, ",")
ctx.Data["UploadMaxSize"] = setting.Repository.Upload.FileMaxSize
ctx.Data["UploadMaxFiles"] = setting.Repository.Upload.MaxFiles
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index fdce18f7a4..c1a2a25a38 100644
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -588,6 +588,7 @@ func ViewPullFiles(ctx *context.Context) {
setPathsCompareContext(ctx, baseCommit, commit, headTarget)
ctx.Data["RequireHighlightJS"] = true
+ ctx.Data["RequireSimpleMDE"] = true
ctx.Data["RequireTribute"] = true
if ctx.Data["Assignees"], err = ctx.Repo.Repository.GetAssignees(); err != nil {
ctx.ServerError("GetAssignees", err)