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.

Sign up for GitHub

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

Jump to bottom

Use markdown frontmatter to provide Table of contents, language and frontmatter rendering #11047

Merged
merged 18 commits into from
Apr 24, 2020
Merged

Use markdown frontmatter to provide Table of contents, language and frontmatter rendering #11047

merged 18 commits into from
Apr 24, 2020

Conversation

zeripath
Copy link
Contributor

@zeripath zeripath commented Apr 11, 2020 •
edited
Loading

  • Add control for the rendering of the frontmatter
  • Add control to include a TOC
  • Add control to set language - allows control of ToC header and CJK glyph choice.

Signed-off-by: Andrew Thornton [email protected]

@zeripath
Use a new "gitea" frontmatter section to control rendering
9de1eb0 
* Add control for the rendering of the frontmatter
* Add control to include a TOC

Signed-off-by: Andrew Thornton <[email protected]>
@zeripath zeripath added type/feature Completely new functionality. Can only be merged if feature freeze is not active. pr/wip This PR is not ready for review labels Apr 11, 2020
@zeripath zeripath added this to the 1.12.0 milestone Apr 11, 2020
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 11, 2020
zeripath added 4 commits April 12, 2020 10:57
@zeripath
As per @lunny
9865bdc 
Signed-off-by: Andrew Thornton <[email protected]>
@zeripath
Add language control for TOC
67ff901 
Signed-off-by: Andrew Thornton <[email protected]>
@zeripath
placate lint
314ac54 
Signed-off-by: Andrew Thornton <[email protected]>
@zeripath
placate unit tests
b87baff 
Signed-off-by: Andrew Thornton <[email protected]>
@zeripath zeripath changed the title WIP: Use a new "gitea" frontmatter section to control rendering Use markdown frontmatter to provide Table of contents, language and frontmatter rendering Apr 13, 2020
@zeripath zeripath removed the pr/wip This PR is not ready for review label Apr 13, 2020
@zeripath zeripath mentioned this pull request Apr 13, 2020
Closed
6543
6543 requested changes Apr 15, 2020
View reviewed changes
modules/markup/markdown/renderconfig.go Outdated Show resolved Hide resolved
options/locale/locale_es-ES.ini Outdated Show resolved Hide resolved
modules/markup/markdown/renderconfig.go Outdated Show resolved Hide resolved
guillep2k
guillep2k reviewed Apr 17, 2020
View reviewed changes
modules/markup/html.go Outdated Show resolved Hide resolved
guillep2k
guillep2k reviewed Apr 18, 2020
View reviewed changes
modules/markup/html.go Outdated Show resolved Hide resolved
guillep2k
guillep2k reviewed Apr 19, 2020
View reviewed changes
modules/markup/html.go Outdated Show resolved Hide resolved
modules/markup/markdown/toc.go Outdated Show resolved Hide resolved
@codecov-io
Copy link

Codecov Report

Merging #11047 into master will decrease coverage by 0.14%.
The diff coverage is 9.14%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #11047      +/-   ##
==========================================
- Coverage   43.47%   43.33%   -0.15%     
==========================================
  Files         600      603       +3     
  Lines       85108    85416     +308     
==========================================
+ Hits        37002    37016      +14     
- Misses      43537    43826     +289     
- Partials     4569     4574       +5
Impacted Files Coverage Δ
modules/markup/html.go 77.38% <0.00%> (-2.22%) ⬇️
modules/markup/markdown/ast.go 0.00% <0.00%> (ø)
modules/markup/markdown/renderconfig.go 0.00% <0.00%> (ø)
modules/markup/markdown/toc.go 0.00% <0.00%> (ø)
modules/markup/markdown/goldmark.go 41.66% <19.82%> (-23.30%) ⬇️
modules/markup/markdown/markdown.go 90.90% <100.00%> (ø)
modules/markup/sanitizer.go 92.77% <100.00%> (+0.27%) ⬆️
models/unit.go 41.97% <0.00%> (-2.47%) ⬇️
modules/log/event.go 64.61% <0.00%> (-1.03%) ⬇️
routers/repo/view.go 36.14% <0.00%> (-0.68%) ⬇️
... and 11 more

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 9588d2c...3ebd430. Read the comment docs.

@zeripath zeripath force-pushed the more-yaml-frontmatter branch from 7a7625b to 4c662df Compare April 23, 2020 07:42
@GiteaBot GiteaBot 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 Apr 24, 2020
6543
6543 approved these changes Apr 24, 2020
View reviewed changes
Copy link
Member

@6543 6543 left a comment

Choose a reason for hiding this comment

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

works ...

@GiteaBot GiteaBot 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 Apr 24, 2020
@zeripath
Copy link
Contributor Author

make lg-tm work

@zeripath
Copy link
Contributor Author

make lg-tm work

@zeripath zeripath merged commit 812cfd0 into go-gitea:master Apr 24, 2020
@zeripath zeripath deleted the more-yaml-frontmatter branch April 24, 2020 13:22
ydelafollye pushed a commit to ydelafollye/gitea that referenced this pull request Jul 31, 2020
@zeripath
Use markdown frontmatter to provide Table of contents, language and f…
6667d47 
…rontmatter rendering (go-gitea#11047)

* Add control for the rendering of the frontmatter
* Add control to include a TOC
* Add control to set language - allows control of ToC header and CJK glyph choice.

Signed-off-by: Andrew Thornton [email protected]
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lunny lunny lunny left review comments

@6543 6543 6543 approved these changes

@guillep2k guillep2k guillep2k approved these changes

@lafriks lafriks lafriks approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/feature Completely new functionality. Can only be merged if feature freeze is not active.
Projects
None yet
Milestone
1.12.0
Development

Successfully merging this pull request may close these issues.
7 participants
@zeripath @codecov-io @lunny @lafriks @guillep2k @6543 @GiteaBot