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

Handle AsciiDoc better, reuse HTML pipeline filters (fixes #9263) #9288

Merged
merged 3 commits into from
May 18, 2015
Merged

Handle AsciiDoc better, reuse HTML pipeline filters (fixes #9263) #9288

merged 3 commits into from
May 18, 2015

Conversation

jirutka
Copy link
Contributor

@jirutka jirutka commented May 12, 2015

This PR basically makes AsciiDoc a “first-class citizen” in GitLab, so we can reuse some HTML pipeline filters etc. The main reason why I’ve done this is to use RelativeLinkFilter (implemented in #9276) for AsciiDoc, and so fix #9263.

Since we don’t need github-markup for AsciiDoc anymore, I’ve updated the Asciidoctor gem to the latest version. The current used version (0.1.4) is ancient.

/cc @tsigo @randx @mojavelinux

@jirutka jirutka mentioned this pull request May 13, 2015
Merged
mojavelinux
mojavelinux reviewed May 13, 2015
View reviewed changes
lib/gitlab/asciidoc.rb

DEFAULT_ADOC_ATTRS = [
'showtitle', 'idprefix=user-content-', 'idseparator=-', 'env=github',
'env-github', 'env=gitlab', 'env-gitlab',
Copy link
Contributor

Choose a reason for hiding this comment

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

The env=github and env-github attributes should be removed. We should only use env=gitlab and env-gitlab attributes.

@mojavelinux
Copy link
Contributor

Overall it looks good to me! I didn't run it, but I reviewed the code.

@mojavelinux
Copy link
Contributor

The current used version (0.1.4) is ancient.

+1000 Let's get out in front of GitHub!

@jirutka
Copy link
Contributor Author

jirutka commented May 13, 2015

@mojavelinux I’ve implemented your suggestions and updated the PR. Thanks!

@jirutka jirutka force-pushed the asciidoc branch 4 times, most recently from 717d364 to 21be32e Compare May 13, 2015 11:55
jirutka added a commit to jirutka/gitlab-foss that referenced this pull request May 13, 2015
@jirutka
Merge pull request gitlabhq#9288 from jirutka/asciidoc
f48ce08 
Handle AsciiDoc better, reuse HTML pipeline filters (fixes #9263)
@dzaporozhets
Copy link
Member

@tsigo can you take a look and merge if ok?

@Razer6
Copy link
Member

Razer6 commented May 13, 2015

@randx Can you add him as a collaborator to the GitHub repo? He does not have rights right now.

@dzaporozhets
Copy link
Member

@Razer6 thank you. I invited him

@mojavelinux
Copy link
Contributor

@jirutka Nice work!

jirutka added a commit to jirutka/gitlab-foss that referenced this pull request May 14, 2015
@jirutka
Add changelog items for gitlabhq#9288
087fb5e
jirutka added a commit to jirutka/gitlab-foss that referenced this pull request May 14, 2015
@jirutka
Add changelog items for gitlabhq#9288
3dffa0e
jirutka added a commit to jirutka/gitlab-foss that referenced this pull request May 16, 2015
@jirutka
Add changelog items for gitlabhq#9288
a889d5c
@dzaporozhets
Copy link
Member

@tsigo can you take a look and merge if ok?

rspeicher
rspeicher reviewed May 18, 2015
View reviewed changes
CHANGELOG
@@ -67,6 +67,8 @@ v 7.11.0 (unreleased)
- Spin spinner icon next to "Checking for CI status..." on MR page.
- Fix reference links in dashboard activity and ATOM feeds.
- Ensure that the first added admin performs repository imports
- Update Asciidoctor gem to version 1.5.2. (Jakub Jirutka)
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think this needs a changelog entry.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Why do you think so? It’s an important change for users that uses AsciiDoc in GitLab.

@rspeicher
Copy link
Contributor

Will merge after render rename and CI pass.

jirutka added a commit to jirutka/gitlab-foss that referenced this pull request May 18, 2015
@jirutka
Add changelog items for gitlabhq#9288
d4976c5
@mojavelinux
Copy link
Contributor

👍

@jirutka
Copy link
Contributor Author

jirutka commented May 18, 2015

@tsigo Method render_asciidoc renamed to render, commits rebased to the current master and CI passed. Let’s merge it! 😸

rspeicher added a commit that referenced this pull request May 18, 2015
@rspeicher
Merge pull request #9288 from jirutka/asciidoc
b61a44f 
Improve AsciiDoc rendering

See #9288
@rspeicher rspeicher merged commit b61a44f into gitlabhq:master May 18, 2015
@jirutka jirutka deleted the asciidoc branch July 9, 2015 18:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@rspeicher rspeicher

Labels
Ready for Merge
Milestone
No milestone
6 participants
@jirutka @mojavelinux @dzaporozhets @Razer6 @rspeicher @jvanbaarsen