Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix plain readme didn't render correctly on repo home page #2705

Merged
merged 3 commits into from
Oct 16, 2017

Conversation

lunny
Copy link
Member

@lunny lunny commented Oct 15, 2017

will fix #2701

@codecov-io
Copy link

codecov-io commented Oct 15, 2017

Codecov Report

Merging #2705 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #2705   +/-   ##
=======================================
  Coverage   26.95%   26.95%           
=======================================
  Files          87       87           
  Lines       17301    17301           
=======================================
  Hits         4664     4664           
  Misses      11957    11957           
  Partials      680      680

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c7f4f07...dee2f54. Read the comment docs.

@tboerger tboerger added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 15, 2017
@lafriks
Copy link
Member

lafriks commented Oct 15, 2017

@lunny I don't know why but integration tests fail

@lunny
Copy link
Member Author

lunny commented Oct 15, 2017

@lafriks I think I find the problem, sent another commit.

@@ -93,6 +93,7 @@ func renderDirectory(ctx *context.Context, treeLink string) {
if isTextFile {
d, _ := ioutil.ReadAll(dataRc)
buf = append(buf, d...)
ctx.Data["IsRenderedHTML"] = true
newbuf := markup.Render(readmeFile.Name(), buf, treeLink, ctx.Repo.Repository.ComposeMetas())
if newbuf != nil {
ctx.Data["IsMarkup"] = true
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ctx.Data["IsMarkup"] is not needed anymore?

@lunny
Copy link
Member Author

lunny commented Oct 16, 2017

@Morlinest done.

@lafriks
Copy link
Member

lafriks commented Oct 16, 2017

LGTM

@tboerger tboerger added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Oct 16, 2017
@bkcsoft
Copy link
Member

bkcsoft commented Oct 16, 2017

LGTM

@tboerger tboerger added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Oct 16, 2017
@bkcsoft bkcsoft merged commit a75d5c7 into go-gitea:master Oct 16, 2017
lunny added a commit to lunny/gitea that referenced this pull request Oct 16, 2017
…2705)

* fix plain readme didn't render correctly on repo home page

* fix missing render

* remove unused template variables
@lunny lunny added the backport/done All backports for this PR have been created label Oct 16, 2017
appleboy pushed a commit that referenced this pull request Oct 16, 2017
…2712)

* fix plain readme didn't render correctly on repo home page

* fix missing render

* remove unused template variables
@lunny lunny deleted the lunny/fix_plain_readme branch October 26, 2017 15:19
@go-gitea go-gitea locked and limited conversation to collaborators Nov 23, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

README.txt vs. README.md
6 participants