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 #2628 - allow meta generator to be diabled #2634

Merged
merged 1 commit into from Jan 14, 2017

Conversation

@adarshdec23
Copy link
Contributor

adarshdec23 commented Jan 14, 2017

No description provided.

Copy link
Contributor

felixfontein left a comment

LGTM (except placement of change). What's missing is a call to scripts/jinjify.py to convert the mako themes to jinja2, but we can also do that when merging.

@@ -11,6 +11,8 @@ Features
* Sort posts in the following order (most important last): source path
(A-Z), title (A-Z), date (reverse chronological order), priority
meta number (descending). (Issue #2627)
* Add META_GENERATOR_TAG option in conf.py allowing the meta generator
to be disabled if needed. (Issue #2628)

This comment has been minimized.

Copy link
@felixfontein

felixfontein Jan 14, 2017

Contributor

You need to add this more at the top, before the changelist for version v7.8.3 starts. Now it looks like this was added in v7.8.3, while it wasn't.

Just start an empty Features section at the top of the file and move the comment there.

This comment has been minimized.

Copy link
@Kwpolska

Kwpolska Jan 14, 2017

Member

@felixfontein This should be the entire New in master/Features/Bugfixes template. I’ll take care of it myself, it’s a pretty minor thing.

@Kwpolska Kwpolska dismissed felixfontein’s stale review Jan 14, 2017

This is so minor that I’ll fix it myself, so no need to withhold this PR.

@Kwpolska Kwpolska merged commit a9656c9 into getnikola:master Jan 14, 2017
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/travis-ci/pr The Travis CI build failed
Details
codacy/pr Good work! A positive pull request.
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
@felixfontein
Copy link
Contributor

felixfontein commented Jan 14, 2017

Sure, fine for me :)

@felixfontein
Copy link
Contributor

felixfontein commented Jan 14, 2017

Thanks @adarshdec23 for implementing this!

@Kwpolska
Copy link
Member

Kwpolska commented Jan 14, 2017

Thanks for contributing to Nikola, @adarshdec23!

Kwpolska added a commit that referenced this pull request Jan 14, 2017
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
@adarshdec23
Copy link
Contributor Author

adarshdec23 commented Jan 14, 2017

Thanks for the merge! :-)

felixfontein added a commit that referenced this pull request Jan 14, 2017
felixfontein added a commit that referenced this pull request Jan 14, 2017
Still missing from #2634.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.