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

Add init support of orgmode document type on file view and readme #2525

Merged
merged 7 commits into from
Sep 21, 2017

Conversation

lunny
Copy link
Member

@lunny lunny commented Sep 17, 2017

will be part of #374 and replace #1527

@lunny lunny added the type/feature Completely new functionality. Can only be merged if feature freeze is not active. label Sep 17, 2017
@lunny lunny added this to the 1.3.0 milestone Sep 17, 2017
This was referenced Sep 17, 2017
@lunny
Copy link
Member Author

lunny commented Sep 17, 2017

CI failed seems unrelated.

@tboerger tboerger added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Sep 17, 2017
@codecov-io
Copy link

codecov-io commented Sep 18, 2017

Codecov Report

❗ No coverage uploaded for pull request base (master@66bc0ac). Click here to learn what that means.
The diff coverage is 89.65%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master    #2525   +/-   ##
=========================================
  Coverage          ?   27.07%           
=========================================
  Files             ?       86           
  Lines             ?    17119           
  Branches          ?        0           
=========================================
  Hits              ?     4635           
  Misses            ?    11809           
  Partials          ?      675
Impacted Files Coverage Δ
routers/api/v1/misc/markdown.go 78% <ø> (ø)
models/mail.go 0% <ø> (ø)
modules/markup/markdown/markdown.go 66.95% <85.71%> (ø)
modules/markup/orgmode/orgmode.go 90.9% <90.9%> (ø)

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 66bc0ac...f53ee7c. Read the comment docs.

)

const AppURL = "http://localhost:3000/"
const Repo = "gogits/gogs"
Copy link
Member

Choose a reason for hiding this comment

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

Why gogits/gogs?

Copy link
Member Author

Choose a reason for hiding this comment

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

No reason. Just copied from markdown test.

main.go Outdated
@@ -14,6 +14,10 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"github.com/urfave/cli"

// register supported doc types
_ "code.gitea.io/gitea/modules/markup/markdown"
Copy link
Member

Choose a reason for hiding this comment

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

Import order

Copy link
Member Author

Choose a reason for hiding this comment

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

done.

@sapk
Copy link
Member

sapk commented Sep 20, 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 Sep 20, 2017
@lafriks
Copy link
Member

lafriks commented Sep 21, 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 Sep 21, 2017
Copy link
Member

@ethantkoenig ethantkoenig left a comment

Choose a reason for hiding this comment

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

LGTM, just two nits


test := func(input, expected string) {
buffer := RenderString(input, setting.AppSubURL, nil, false)
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(string(buffer)))
Copy link
Member

Choose a reason for hiding this comment

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

nit: unnecessary cast of buffer


test := func(input, expected string) {
buffer := RenderString(input, setting.AppSubURL, nil, false)
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(string(buffer)))
Copy link
Member

Choose a reason for hiding this comment

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

nit: unnecessary cast of buffer

@lunny
Copy link
Member Author

lunny commented Sep 21, 2017

@ethantkoenig done.

@lunny lunny merged commit 0d80af6 into go-gitea:master Sep 21, 2017
@lunny lunny deleted the lunny/org-mode-support2 branch September 21, 2017 05:20
@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
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
Development

Successfully merging this pull request may close these issues.

7 participants