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

Include theme directories in default gemspec #5152

Merged
merged 3 commits into from Jul 28, 2016

Conversation

Projects
None yet
4 participants
@benbalter
Contributor

benbalter commented Jul 28, 2016

See jekyll/minima#6.

We need to include the theme directories, not exclude them.

@benbalter

This comment has been minimized.

Show comment
Hide comment
@benbalter

benbalter Jul 28, 2016

Contributor

As written, this PR will only include files in the theme directories. Do we want to include the LICENSE? I think the other files are safe to not include.

Contributor

benbalter commented Jul 28, 2016

As written, this PR will only include files in the theme directories. Do we want to include the LICENSE? I think the other files are safe to not include.

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr Jul 28, 2016

Member

Durrrrr. Thanks @benbalter!

Do we want to include the LICENSE? I think the other files are safe to not include.

Yeah! If we're generating a license and readme, we should include them.

Thank you!

Member

parkr commented Jul 28, 2016

Durrrrr. Thanks @benbalter!

Do we want to include the LICENSE? I think the other files are safe to not include.

Yeah! If we're generating a license and readme, we should include them.

Thank you!

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr Jul 28, 2016

Member

LGTM.

Member

parkr commented Jul 28, 2016

LGTM.

@parkr parkr added this to the 3.2.1 milestone Jul 28, 2016

@parkr parkr added the bug label Jul 28, 2016

@benbalter

This comment has been minimized.

Show comment
Hide comment
@benbalter

benbalter Jul 28, 2016

Contributor

@parkr Can I LGTM my own PR?

Contributor

benbalter commented Jul 28, 2016

@parkr Can I LGTM my own PR?

@benbalter

This comment has been minimized.

Show comment
Hide comment
@benbalter

benbalter Jul 28, 2016

Contributor

Also to note, we should update minima once this merges.

Contributor

benbalter commented Jul 28, 2016

Also to note, we should update minima once this merges.

@parkr parkr modified the milestone: 3.2.1 Jul 28, 2016

@parkr parkr referenced this pull request Jul 28, 2016

Closed

Release v3.2.1 #5159

5 of 5 tasks complete
@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr Jul 28, 2016

Member

@parkr Can I LGTM my own PR?

Yep!

Also to note, we should update minima once this merges.

To use this method? Sure!

LGTM.

Member

parkr commented Jul 28, 2016

@parkr Can I LGTM my own PR?

Yep!

Also to note, we should update minima once this merges.

To use this method? Sure!

LGTM.

@benbalter

This comment has been minimized.

Show comment
Hide comment
@benbalter

benbalter Jul 28, 2016

Contributor

LGTM.

Contributor

benbalter commented Jul 28, 2016

LGTM.

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr Jul 28, 2016

Member

@jekyllbot: merge +bug

Member

parkr commented Jul 28, 2016

@jekyllbot: merge +bug

@jekyllbot jekyllbot merged commit 8e25b8b into master Jul 28, 2016

2 of 3 checks passed

continuous-integration/appveyor/pr AppVeyor build failed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
jekyll/lgtm Approved by @parkr and @benbalter.

@jekyllbot jekyllbot added bug fix labels Jul 28, 2016

@jekyllbot jekyllbot deleted the theme-dir-regex-fix branch Jul 28, 2016

jekyllbot added a commit that referenced this pull request Jul 28, 2016

parkr added a commit that referenced this pull request Aug 2, 2016

Merge branch 'master' into build-the-site
* master:
  Update history to reflect merge of #5152 [ci skip]
  Missing trailing |
  Update history to reflect merge of #5158 [ci skip]
  Also include LICENSE and README
  note that themes have been released
  Update history to reflect merge of #5143 [ci skip]
  Update history to reflect merge of #5150 [ci skip]
  Revert "Readability: lib/jekyll/static_file.rb."
  include theme directories in default gemspec
  [site] enable excerpts
  Centre align text and use nav styles on helpful links.
  Puns FTW
  Add helpful links and minor alignment tweak.
  Create error template that has no main nav or footer.
  Use more generic wording.
  sitemap: false so that the error page is not indexed
  Initial 404 page
@wommy

This comment has been minimized.

Show comment
Hide comment
@wommy

wommy commented Aug 6, 2016

@wommy

This comment has been minimized.

Show comment
Hide comment
@wommy

wommy Aug 11, 2016

@benbalter @parkr thoughts on my above?

wommy commented Aug 11, 2016

@benbalter @parkr thoughts on my above?

@benbalter

This comment has been minimized.

Show comment
Hide comment
@benbalter

benbalter Aug 12, 2016

Contributor

@wommy you're spot on your with commit comment. Mind opening a dedicated issue in this repo to figure out which approach is best to harmonize the three?

Contributor

benbalter commented Aug 12, 2016

@wommy you're spot on your with commit comment. Mind opening a dedicated issue in this repo to figure out which approach is best to harmonize the three?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment