dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1817 from jekyll/move-to-jekyll-jekyll 

mojombo/jekyll ~> jekyll/jekyll
This commit is contained in:
Matt Rogers 2013-12-11 14:50:21 -08:00
parent 6d0a168d6d 6195192bcf
commit 3e2c229e97
9 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CONTRIBUTING.markdown
View File

@ -53,7 +53,7 @@ Here's the most direct way to get your work merged into the project:
* Make sure everything still passes by running `rake`. * Make sure everything still passes by running `rake`.
* If necessary, rebase your commits into logical chunks, without errors. * If necessary, rebase your commits into logical chunks, without errors.
* Push the branch up ( `git push origin my_awesome_feature` ). * Push the branch up ( `git push origin my_awesome_feature` ).
* Create a pull request against mojombo/jekyll and describe what your change * Create a pull request against jekyll/jekyll and describe what your change
does and the why you think it should be merged. does and the why you think it should be merged.
Updating Documentation Updating Documentation
@ -63,14 +63,14 @@ We want the Jekyll documentation to be the best it can be. We've
open-sourced our docs and we welcome any pull requests if you find it open-sourced our docs and we welcome any pull requests if you find it
lacking. lacking.
You can find the documentation for jekyllrb.com in the You can find the documentation for jekyllrb.com in the
[site](https://github.com/mojombo/jekyll/tree/master/site) directory of [site](https://github.com/jekyll/jekyll/tree/master/site) directory of
Jekyll's repo on GitHub.com. Jekyll's repo on GitHub.com.
All documentation pull requests should be directed at `master`. Pull All documentation pull requests should be directed at `master`. Pull
requests directed at another branch will not be accepted. requests directed at another branch will not be accepted.
The [Jekyll wiki](https://github.com/mojombo/jekyll/wiki) on GitHub The [Jekyll wiki](https://github.com/jekyll/jekyll/wiki) on GitHub
can be freely updated without a pull request as all GitHub users have access. can be freely updated without a pull request as all GitHub users have access.
Gotchas Gotchas
@ -78,7 +78,7 @@ Gotchas
* If you want to bump the gem version, please put that in a separate commit. * If you want to bump the gem version, please put that in a separate commit.
This way, the maintainers can control when the gem gets released. This way, the maintainers can control when the gem gets released.
* Try to keep your patch(es) based from the latest commit on mojombo/jekyll. * Try to keep your patch(es) based from the latest commit on jekyll/jekyll.
The easier it is to apply your work, the less work the maintainers have to do, The easier it is to apply your work, the less work the maintainers have to do,
which is always a good thing. which is always a good thing.
* Please don't tag your GitHub issue with [fix], [feature], etc. The maintainers * Please don't tag your GitHub issue with [fix], [feature], etc. The maintainers

12
README.markdown
View File

@ -2,10 +2,10 @@
[![Gem Version](https://badge.fury.io/rb/jekyll.png)](http://badge.fury.io/rb/jekyll) [![Gem Version](https://badge.fury.io/rb/jekyll.png)](http://badge.fury.io/rb/jekyll)
[![Build Status](https://secure.travis-ci.org/mojombo/jekyll.png?branch=master)](https://travis-ci.org/mojombo/jekyll) [![Build Status](https://secure.travis-ci.org/jekyll/jekyll.png?branch=master)](https://travis-ci.org/jekyll/jekyll)
[![Code Climate](https://codeclimate.com/github/mojombo/jekyll.png)](https://codeclimate.com/github/mojombo/jekyll) [![Code Climate](https://codeclimate.com/github/jekyll/jekyll.png)](https://codeclimate.com/github/jekyll/jekyll)
[![Dependency Status](https://gemnasium.com/mojombo/jekyll.png)](https://gemnasium.com/mojombo/jekyll) [![Dependency Status](https://gemnasium.com/jekyll/jekyll.png)](https://gemnasium.com/jekyll/jekyll)
[![Coverage Status](https://coveralls.io/repos/mojombo/jekyll/badge.png)](https://coveralls.io/r/mojombo/jekyll) [![Coverage Status](https://coveralls.io/repos/jekyll/jekyll/badge.png)](https://coveralls.io/r/jekyll/jekyll)
By Tom Preston-Werner, Nick Quaranto, and many awesome contributors! By Tom Preston-Werner, Nick Quaranto, and many awesome contributors!
@ -15,7 +15,7 @@ Jekyll is a simple, blog aware, static site generator. It takes a template direc
* [Install](http://jekyllrb.com/docs/installation/) the gem * [Install](http://jekyllrb.com/docs/installation/) the gem
* Read up about its [Usage](http://jekyllrb.com/docs/usage/) and [Configuration](http://jekyllrb.com/docs/configuration/) * Read up about its [Usage](http://jekyllrb.com/docs/usage/) and [Configuration](http://jekyllrb.com/docs/configuration/)
* Take a gander at some existing [Sites](http://wiki.github.com/mojombo/jekyll/sites) * Take a gander at some existing [Sites](http://wiki.github.com/jekyll/jekyll/sites)
* Fork and [Contribute](http://jekyllrb.com/docs/contributing/) your own modifications * Fork and [Contribute](http://jekyllrb.com/docs/contributing/) your own modifications
* Have questions? Check out `#jekyll` on irc.freenode.net. * Have questions? Check out `#jekyll` on irc.freenode.net.
@ -53,4 +53,4 @@ Jekyll is a simple, blog aware, static site generator. It takes a template direc
## License ## License
See [LICENSE](https://github.com/mojombo/jekyll/blob/master/LICENSE). See [LICENSE](https://github.com/jekyll/jekyll/blob/master/LICENSE).

2
Rakefile
View File

@ -169,7 +169,7 @@ namespace :site do
puts "Checking for gh-pages dir..." puts "Checking for gh-pages dir..."
unless File.exist?("./gh-pages") unless File.exist?("./gh-pages")
puts "No gh-pages directory found. Run the following commands first:" puts "No gh-pages directory found. Run the following commands first:"
puts " `git clone git@github.com:mojombo/jekyll gh-pages" puts " `git clone git@github.com:jekyll/jekyll gh-pages"
puts " `cd gh-pages" puts " `cd gh-pages"
puts " `git checkout gh-pages`" puts " `git checkout gh-pages`"
exit(1) exit(1)

2
jekyll.gemspec
View File

@ -15,7 +15,7 @@ Gem::Specification.new do |s|
s.authors = ["Tom Preston-Werner"] s.authors = ["Tom Preston-Werner"]
s.email = 'tom@mojombo.com' s.email = 'tom@mojombo.com'
s.homepage = 'http://github.com/mojombo/jekyll' s.homepage = 'http://github.com/jekyll/jekyll'
s.require_paths = %w[lib] s.require_paths = %w[lib]

2
lib/site_template/_posts/0000-00-00-welcome-to-jekyll.markdown.erb
View File

@ -20,5 +20,5 @@ print_hi('Tom')
Check out the [Jekyll docs][jekyll] for more info on how to get the most out of Jekyll. File all bugs/feature requests at [Jekyll's GitHub repo][jekyll-gh]. Check out the [Jekyll docs][jekyll] for more info on how to get the most out of Jekyll. File all bugs/feature requests at [Jekyll's GitHub repo][jekyll-gh].
[jekyll-gh]: https://github.com/mojombo/jekyll [jekyll-gh]: https://github.com/jekyll/jekyll
[jekyll]: http://jekyllrb.com [jekyll]: http://jekyllrb.com

2
site/_config.yml
View File

@ -3,4 +3,4 @@ relative_permalinks: false
gauges_id: 503c5af6613f5d0f19000027 gauges_id: 503c5af6613f5d0f19000027
permalink: /news/:year/:month/:day/:title/ permalink: /news/:year/:month/:day/:title/
excerpt_separator: noifniof3nioaniof3nioafafinoafnoif excerpt_separator: noifniof3nioaniof3nioafafinoafnoif
repository: https://github.com/mojombo/jekyll repository: https://github.com/jekyll/jekyll

2
site/_posts/2013-09-14-jekyll-1-2-1-released.markdown
View File

@ -8,7 +8,7 @@ categories: [release]
--- ---
Quick turnover, anyone? A [recent incompatibility with Liquid Quick turnover, anyone? A [recent incompatibility with Liquid
v2.5.2](https://github.com/mojombo/jekyll/pull/1525) produced a nasty bug in v2.5.2](https://github.com/jekyll/jekyll/pull/1525) produced a nasty bug in
which `include` tags were not rendered properly within `if` blocks. which `include` tags were not rendered properly within `if` blocks.
This release also includes a better handling of detached servers (prints pid and This release also includes a better handling of detached servers (prints pid and

2
site/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown
View File

@ -13,7 +13,7 @@ available for any early adopters who want to give the latest and
greatest code a spin without having to clone a repository from git. greatest code a spin without having to clone a repository from git.
Please take this prerelease for a spin and [let us Please take this prerelease for a spin and [let us
know](https://github.com/mojombo/jekyll/issues/new) if you run into any know](https://github.com/jekyll/jekyll/issues/new) if you run into any
issues! issues!

4
site/docs/contributing.md
View File

@ -85,7 +85,7 @@ git checkout -b my_awesome_feature
git push origin my_awesome_feature git push origin my_awesome_feature
{% endhighlight %} {% endhighlight %}
* Create a pull request against mojombo/jekyll:master and describe what your * Create a pull request against jekyll/jekyll:master and describe what your
change does and the why you think it should be merged. change does and the why you think it should be merged.
Updating Documentation Updating Documentation
@ -111,7 +111,7 @@ Gotchas
* If you want to bump the gem version, please put that in a separate commit. * If you want to bump the gem version, please put that in a separate commit.
This way, the maintainers can control when the gem gets released. This way, the maintainers can control when the gem gets released.
* Try to keep your patch(es) based from the latest commit on mojombo/jekyll. * Try to keep your patch(es) based from the latest commit on jekyll/jekyll.
The easier it is to apply your work, the less work the maintainers have to do, The easier it is to apply your work, the less work the maintainers have to do,
which is always a good thing. which is always a good thing.
* Please don't tag your GitHub issue with \[fix\], \[feature\], etc. The maintainers * Please don't tag your GitHub issue with \[fix\], \[feature\], etc. The maintainers