diff options
| author | Andrey Nering <andrey.nering@gmail.com> | 2016-08-11 21:07:09 -0300 |
|---|---|---|
| committer | 无闻 <u@gogs.io> | 2016-08-11 17:07:09 -0700 |
| commit | dbed39ba05fd498dad6cd3bf127c1f68056bf2ab (patch) | |
| tree | 5f57a18ecdb444bbf52e583894fc38f2d8d50280 /routers | |
| parent | aa1fc30b898a928ddafbfd0fddc47547c04f96e5 (diff) | |
| download | gitea-dbed39ba05fd498dad6cd3bf127c1f68056bf2ab.tar.gz gitea-dbed39ba05fd498dad6cd3bf127c1f68056bf2ab.zip | |
On showing diff/file, use the tab_width specified on .editorconfig, if any (#3241)
Closes #3182
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/repo/commit.go | 7 | ||||
| -rw-r--r-- | routers/repo/pull.go | 14 | ||||
| -rw-r--r-- | routers/repo/view.go | 6 |
3 files changed, 27 insertions, 0 deletions
diff --git a/routers/repo/commit.go b/routers/repo/commit.go index 4eb37e6bdb..c102ceae41 100644 --- a/routers/repo/commit.go +++ b/routers/repo/commit.go @@ -174,6 +174,13 @@ func Diff(ctx *context.Context) { } } + ec, err := ctx.Repo.GetEditorconfig() + if err != nil && !git.IsErrNotExist(err) { + ctx.Handle(500, "ErrGettingEditorconfig", err) + return + } + ctx.Data["Editorconfig"] = ec + ctx.Data["CommitID"] = commitID ctx.Data["IsSplitStyle"] = ctx.Query("style") == "split" ctx.Data["Username"] = userName diff --git a/routers/repo/pull.go b/routers/repo/pull.go index 8fb7ae1831..77ee4bd348 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -371,6 +371,13 @@ func ViewPullFiles(ctx *context.Context) { return } + ec, err := ctx.Repo.GetEditorconfig() + if err != nil && !git.IsErrNotExist(err) { + ctx.Handle(500, "ErrGettingEditorconfig", err) + return + } + ctx.Data["Editorconfig"] = ec + headTarget := path.Join(pull.HeadUserName, pull.HeadRepo.Name) ctx.Data["IsSplitStyle"] = ctx.Query("style") == "split" ctx.Data["Username"] = pull.HeadUserName @@ -623,6 +630,13 @@ func CompareAndPullRequest(ctx *context.Context) { } } + ec, err := ctx.Repo.GetEditorconfig() + if err != nil && !git.IsErrNotExist(err) { + ctx.Handle(500, "ErrGettingEditorconfig", err) + return + } + ctx.Data["Editorconfig"] = ec + ctx.HTML(200, COMPARE_PULL) } diff --git a/routers/repo/view.go b/routers/repo/view.go index 9c495b701c..e685597a55 100644 --- a/routers/repo/view.go +++ b/routers/repo/view.go @@ -225,6 +225,12 @@ func Home(ctx *context.Context) { ctx.Data["Username"] = userName ctx.Data["Reponame"] = repoName + ec, err := ctx.Repo.GetEditorconfig() + if err != nil && !git.IsErrNotExist(err) { + ctx.Handle(500, "ErrGettingEditorconfig", err) + return + } + ctx.Data["Editorconfig"] = ec var treenames []string paths := make([]string, 0) |