Commit Graph

324 Commits

Author SHA1 Message Date
Parker Moore 344906deb9 Release 2.0.0. 2014-05-06 20:11:44 -04:00
Parker Moore e04e11c84d Swap env of maruku and kramdown dependencies.
Maruku is now sunsetted, i.e. a dev dep, not a runtime dep.
Kramdown is now the default, i.e. a runtime dep, not a dev dep.
Closes #2285.
2014-05-04 21:05:14 -04:00
Parker Moore 4a40187f8e Update jekyll-sass-converter to the latest RC
To see a detailed history of the changes, please visit https://github.com/jekyll/jekyll-sass-converter/compare/v1.0.0.rc3...v1.0.0.rc4

Notable change is that you can now set the style of the outputted Sass.
Ref: https://github.com/jekyll/jekyll-sass-converter/issues/3
2014-04-27 19:15:02 -04:00
Parker Moore 744fb2865d Lock to cucumber v1.3.11 because 1.3.12 is failing like crazy. 2014-03-18 23:53:19 -04:00
Parker Moore ed30920984 Use jekyll-sass-converter 1.0.0.rc3 2014-03-04 15:57:15 -05:00
Parker Moore e2af1b547b Extract core extensions into a Utils module
Fixes #2111
2014-03-03 22:13:03 -05:00
Parker Moore 80c39cf670 Choose jekyll-sass-converter 1.0.0.rc1 2014-02-28 21:12:00 -05:00
Parker Moore 9ffb984f37 Sass support should be shipped outside core. 2014-02-28 21:12:00 -05:00
Parker Moore 77f26d5681 Upgrade to guard/listen 2.x 2014-02-24 17:10:43 -05:00
Parker Moore 8a0d036b87 Greatly simplify Jekyll's gemspec. 2014-02-24 16:15:51 -05:00
Parker Moore d54764924b Bump Mercenary to ~> 0.3.1 2014-02-21 14:13:35 -05:00
Parker Moore 05ea209d5f Bump to Mercenary ~> 0.3.0
https://github.com/jekyll/mercenary/releases/tag/v0.3.0
2014-02-20 18:58:14 -05:00
Parker Moore e1fa657f2b Update gemspec file list. 2014-02-19 23:27:18 -05:00
Matt Rogers 41325ab308 Merge pull request #2045 from jekyll/kill-1-9-2 2014-02-14 12:46:07 -06:00
Parker Moore 36b2963343 Kill 1.9.2 support. 2014-02-14 13:30:14 -05:00
Matt Rogers ad9250d106 Bump Redcarpet to 3.1.0
- Footnotes
- GitHub style header anchors
- quotation marks as <q> tags
- A few other bug fixes
2014-02-14 12:17:29 -06:00
Parker Moore 88e35f0852 Release 2.0.0.alpha.1 2014-02-13 18:02:49 -05:00
Parker Moore d43341fab0 Merge pull request #2009 from penibelst/test-sass-include 2014-02-13 17:56:38 -05:00
Parker Moore f607aefeb8 Update jekyll.gemspec with new files.
Ref: #2020
2014-02-09 18:43:46 -05:00
Jashank Jeremy f8d6ff42ff Update Jekyll gemspec.
The master gemspec has gotten a tad out of date; this updates the
manifest, notably, but also the version number, to bring it in line with
v1-stable.  I'm not sure this is precisely the right way for the latter
to work; @parkr, would you like to comment on this?
2014-02-04 12:45:14 +11:00
Anatol Broder ce2b4ae963 Upgrade gemspec 2014-02-04 02:06:50 +01:00
Parker Moore fdbfd719ca Add CoffeeScript converter. 2014-01-25 20:38:51 -05:00
Parker Moore 774bf96c61 Merge master into sass 2014-01-24 12:17:35 -05:00
Matt Rogers 3b485b4497 Lock Maruku to 0.7.0
This fixes the errors we see in our tests due to the upgrade to Maruku
0.7.1
2014-01-15 23:11:27 -06:00
Parker Moore 45c0523e55 update dat gemspec 2014-01-14 08:43:29 -08:00
Parker Moore 245597c2db Require Liquid 2.5.5 <= x < 2.6 2014-01-13 22:28:16 -08:00
Parker Moore 66732b91c1 Make sass a runtime dependency. 2014-01-12 21:30:30 -08:00
Parker Moore 824a84ef2a Add support for Sass and SCSS. 2014-01-12 21:30:29 -08:00
Aidan Feldman 716b8ede0e Loosen dependency on Shoulda
Fixes build for Ruby 2.1.0.
2014-01-03 05:44:47 -05:00
Matt Rogers 012387396a Merge pull request #1859 from robin850/rouge 2013-12-30 22:45:07 -06:00
Christoph Hochstrasser dd919751ac Update kramdown to 1.3 2013-12-30 22:14:41 +01:00
Parker Moore 3744e70128 Raise restriction of safe_yaml to ~>1.0
Amends #1886
2013-12-28 13:47:35 -05:00
Ivan Tse 9d5683dc71 Bump safe_yaml version to include the fix for dtao/safe_yaml#35 2013-12-28 02:42:48 -05:00
Parker Moore d2314d360a Bump mercenary to ~> 0.2.0 2013-12-26 14:34:28 -05:00
Robin Dupret 036cbda2f6 Require at least 1.3.0 for Rouge
Rouge 1.3.0 introduced a `rouge_formatter` helper which is handy to
overwrite the formatter default when using the Redcarpet plugin so let's
require this version at the very least.

An abort statement will be thrown when the installed version is not
correct.
2013-12-25 18:06:29 +01:00
Robin Dupret 0831d2b0f8 Add support for the Rouge syntax highlighter
By setting the `highlighter` setting to `rouge` you can now easily
highlight your code with it instead of relying on Pygments. However,
Jekyll doesn't depend on Rouge explicitly, you will need to install it
or add it to your Gemfile.

The documentation has been updated accordingly.
2013-12-22 18:45:40 +01:00
Parker Moore 6195192bcf mojombo/jekyll ~> jekyll/jekyll 2013-12-11 17:44:33 -05:00
Parker Moore 1c22b3f751 Bump RedCarpet dependency to ~> 3.0 2013-12-11 16:51:57 -05:00
Matt Rogers 39b6fe732f Merge pull request #1780 from mojombo/kill-1-8 2013-12-11 06:08:10 -08:00
Matt Rogers 58159389b8 Merge pull request #1706 from mojombo/drop-commander 2013-12-10 21:16:42 -08:00
Parker Moore 585e074cda Update files list in gemspec.
Fixes #1793
2013-12-09 12:29:45 -05:00
Parker Moore b58cd5c132 Merge pull request #1657 from mojombo/safe-whitelist
A gem-based plugin whitelist for `safe` mode
2013-12-07 21:41:55 -08:00
Matt Rogers 3788c08b13 prep the gemspec for 1.4.0 2013-12-07 17:59:21 -06:00
Matt Rogers 9f1593299a Merge pull request #1775 from Ivoz/maruku
Update to maruku 0.7
2013-12-06 20:56:52 -08:00
Parker Moore 96ecfb30ef Require Ruby version >= 1.9.2 in gemspec 2013-12-06 01:42:23 -05:00
Parker Moore 8d898dafde Add "jekyll_test_plugin_malicious" as gem dep 2013-12-06 00:22:07 -05:00
Parker Moore aabb3e96cc Upgrade toml gem to 0.1.0 2013-12-05 18:08:32 -05:00
Matthew Iversen 0bdfed4b25 Update requirements to maruku 0.7 2013-12-05 11:59:36 +11:00
Parker Moore 51706e8da7 Parse TOML or YAML in Jekyll::Configuration. 2013-11-28 22:11:56 -05:00
Matt Rogers 4f337df2d8 Update the gemspec with the release post 2013-11-26 20:45:57 -06:00
Matt Rogers 91a4c5611e Prep for the 1.3.1 release 2013-11-26 20:27:27 -06:00
Parker Moore b61534d260 Switch from commander to mercenary in gemspec 2013-11-20 22:51:24 -05:00
Matt Rogers cc0c82f9d2 Prep for the 1.3.0 release 2013-11-03 21:46:02 -06:00
Matt Rogers ace1e0fc01 Use the proper date in the gemspec 2013-10-30 07:44:11 -05:00
Parker Moore a1fc0b18e8 Add Jekyll 1.3.0.rc1 Release Post to Gemspec 2013-10-29 12:31:02 -04:00
Matt Rogers 9f63ddb4db Prepare for a 1.3.0.rc release 2013-10-28 20:26:36 -05:00
Parker Moore 0c2d7c0864 Restrict mime-types gem to pre-2.0.
A coveralls dep has a '>=' dependency on mime-types.
2013-10-28 14:16:10 -04:00
Parker Moore a0a9c5f676 Allow any versions of listen < 2.0 and >= 1.3 2013-10-28 14:04:37 -04:00
Matt Rogers 71d4319d5f Downgrade Listen to 1.3.x
This is so that we can be Ruby 1.8.x compatible.
2013-10-26 22:08:38 -05:00
Matt Rogers 2287eed0c6 Merge pull request #1589 from dchest/better-watch
Replace directory_watcher with listen.
2013-10-23 22:38:56 -05:00
Dmitry Chestnykh 12ba0a541c Update listen to ~> 2.0. 2013-10-18 11:04:54 +02:00
Parker Moore 694599645f Add in test plugin for inclusion. 2013-10-04 15:49:47 -04:00
Erik Michaels-Ober cebb936e60 Update safe_yaml dependency to ~> 0.9.7 2013-10-04 19:52:55 +02:00
Parker Moore 68306c691a Merge pull request #1610 from sferik/update_kramdown_dependency
Update kramdown dependency to ~> 1.2
2013-10-04 09:30:41 -07:00
Parker Moore 6b2561424a Merge pull request #1603 from sferik/update_rake_dependency
Update rake dependency to ~> 10.1
2013-10-04 09:29:12 -07:00
Parker Moore ddcb6e95f5 Merge pull request #1606 from sferik/update_coveralls_dependency
Update coveralls dependency to ~> 0.7.0
2013-10-04 09:28:30 -07:00
Parker Moore 82c8672632 Fix merge conflict. 2013-10-04 12:26:07 -04:00
Parker Moore 38d70938e9 Merge pull request #1604 from sferik/update_rr_dependency
Update rr dependency to version ~> 1.1
2013-10-04 09:23:04 -07:00
Erik Michaels-Ober be36ca5e6a Update kramdown dependency to ~> 1.2 2013-10-04 12:04:56 +02:00
Erik Michaels-Ober aea486819c Update launchy dependency to ~> 2.3 2013-10-04 12:01:37 +02:00
Erik Michaels-Ober 4b6f96903f Update cucumber dependency to ~> 1.3 2013-10-04 11:59:33 +02:00
Erik Michaels-Ober ed17ef2b96 Update coveralls dependency to ~> 0.7.0 2013-10-04 11:57:41 +02:00
Erik Michaels-Ober 7bf7359d1b Update rr dependency to version ~> 1.1 2013-10-04 11:36:10 +02:00
Erik Michaels-Ober d098a35d65 Update rake dependency to ~> 10.1 2013-10-04 11:29:07 +02:00
Parker Moore 422b75ae39 Downgrade to Maruku 0.6.0 to fix all the tests 2013-10-02 15:05:33 +00:00
liufengyun 760cbc7f91 Autoload yaml files under _data directory
The jekyll engine will autoload all yaml files(ends with .yml or .yaml)
under _data. If there's a file members.yml under the directory, then user
can access contents of the file through site.members.
2013-10-01 11:23:33 +08:00
Dmitry Chestnykh 8fe25a6958 Replace directory_watcher with listen.
Directory_watcher consumed ~25% CPU on big Jekyll projects (depending on
the number of watched files), since it polled for changes every second.

Listen is easier on CPU, as it uses directory change notifications
provided by OS (currently OS X and Linux), falling back to polling when
they are not available.
2013-09-30 04:33:04 +02:00
Matt Rogers 52a39db029 Merge pull request #1539 from maul-esel/coveralls
Add support for coveralls.io coverage reports
2013-09-16 18:28:28 -07:00
Parker Moore 6f053fbc8c Update gemspec & version to v1.2.1 2013-09-14 20:59:06 -04:00
maul.esel b26327f20a simplify conditions for coverage reports 2013-09-14 15:28:41 +02:00
Parker Moore db397dacdd Upgrade to Liquid 2.5.2 2013-09-12 10:23:24 -04:00
Parker Moore 9422fe63fc Merge pull request #1515 from drewish/redcarpet-2.3
Update redcarpet to 2.3.0
2013-09-10 08:55:40 -07:00
Parker Moore 94e001e549 Update gemspec 2013-09-09 20:23:30 -04:00
jaybe@jekyll d485b3e099 Updated jekyll.gemspec manifest site/news/[index.md][releases/index.md] to reflect reality- [index.html] 2013-09-09 17:48:58 -05:00
andrew morton 91006d9d61 Update redcarpet to 2.3.0 2013-09-07 12:58:16 -07:00
Parker Moore 422398d46d Update gemspec for release of v1.2. 2013-09-06 22:23:56 -04:00
Troy Swanson b487dff7bf Add kramdown as a development dependency 2013-09-03 13:12:49 -05:00
Troy Swanson 2ababea17d Remove kramdown as a gem dependency 2013-09-02 23:38:08 -05:00
Parker Moore 0db5dcf832 Release 1.1.2 2013-07-25 09:15:34 +02:00
Ben Balter fe34165dcd require liquid >= 2.5.1 2013-07-24 21:05:52 -04:00
Parker Moore fe10f21d8d Release 1.1.1 2013-07-24 22:42:03 +02:00
Parker Moore e8662422e3 Add Jekyll v1.1.0 release notes post. 2013-07-14 19:53:48 +02:00
Parker Moore d572e588e8 Release 1.1.0 2013-07-14 19:52:44 +02:00
Tyler Margison cf21de08c5 Update gemspec to match new file extensions 2013-07-09 15:05:09 -07:00
Matt Rogers d5caebfc06 Make redcarpet a runtime dependency 2013-06-27 12:35:01 -05:00
Parker Moore f652d0d045 Restrict activesupport dependency to pre-4.0.0 to maintain <= 1.9.2 compatibility. 2013-06-27 18:51:39 +02:00
Parker Moore 700d840a06 Release 1.0.3 2013-06-07 21:02:13 +02:00
Parker Moore 3ef819833d Update files in gemspec. 2013-06-02 14:30:53 +02:00
zachgersh 20eda0e89f Merge branch 'master' into changelist_page 2013-05-28 21:54:49 -07:00
Matt Rogers 5cc65de628 Stick to the 1.0.x versions of rr 2013-05-23 12:16:06 -05:00
Parker Moore 784aaee40a Update gemspec with new files. 2013-05-15 23:58:32 +02:00
zachgersh 94b5f22cfa Merge branch 'master' into changelist_page 2013-05-12 08:20:03 -07:00
Parker Moore 8051df0f4c Release 1.0.2 2013-05-12 15:26:45 +02:00
zachgersh e4543e268f Added /history directory to the gemspec. 2013-05-11 21:40:26 -07:00
Parker Moore d869f99345 Update gemspec for new page-based docs. 2013-05-11 17:08:46 +02:00
Mort Yao 8d0543d54c Bump pygments.rb version to 0.5.0 2013-05-09 13:51:25 +02:00
Marcus Stollsteimer 7977c5ed1b Update to kramdown 1.0.2 2013-05-09 13:26:29 +02:00
Parker Moore c758f8d24f Release 1.0.1 2013-05-08 01:03:14 +02:00
Parker Moore 9f94eaf061 Release 1.0.0 2013-05-06 01:16:34 +02:00
Parker Moore 58103d11c9 Add Upgrading docs page to gemspec. 2013-05-05 23:51:10 +02:00
Parker Moore 06beb4b72b Bump version for 1.0.0. 2013-05-05 23:02:45 +02:00
Parker Moore 3e670e72ab Update gemspec. 2013-05-05 15:20:18 +02:00
Parker Moore c0c0150bb5 Release 1.0.0.rc1 2013-04-16 00:47:31 +02:00
Parker Moore e4b8dbc112 Add files to the manifest in the gemspec 2013-04-15 19:15:55 +02:00
Parker Moore 97dbadb5dd Add colorator gem 2013-04-13 19:46:25 +02:00
Parker Moore 1319b823f8 Release 1.0.0.beta4 2013-04-09 21:31:23 +02:00
maul.esel 439278fc2c exclude cucumber 1.2.4 2013-04-08 13:25:47 +02:00
Parker Moore 7376d66af2 Upgrade pygments.rb to 0.4.2. Fixes #927 2013-04-05 19:04:10 +02:00
Parker Moore 28097a9ebb Updated version to 1.0.0.beta3. 2013-04-04 16:14:54 +02:00
Parker Moore cf393cb862 Using directory_watcher 1.4.1.
1.5.1 has issues on ubuntu.
#916.
2013-04-03 19:03:25 +02:00
Alexander Ekdahl 91197a1928 Fixes for directory_watcher 1.5.x integration. Closes #916. 2013-04-03 00:58:25 +02:00
Parker Moore 51e130bb79 Force usage of older directory_watcher gem as 1.5 is broken. #883 2013-03-25 19:01:28 +01:00
Parker Moore de8f0c986c Update version for 1.0.0.beta2. 2013-03-19 00:08:56 +01:00
Parker Moore 92a2a9ff61 Update gemspec so bundler doesn't complain. 2013-03-17 21:07:27 +01:00
Parker Moore a15e0c811b Remove git poop. 2013-03-17 15:47:26 +01:00
Parker Moore aa7a234c18 Merge master into jekyll-new 2013-03-17 15:45:37 +01:00
Parker Moore 5c35a84662 Updated version and gemspec to reflect 1.0.0.beta1 release 2013-03-14 21:26:06 +01:00
Daniel Grieve 5bcc2fd8f9 update safe_yaml 2013-03-13 21:57:08 +00:00
Daniel Grieve 4be5dfdb9a fix copying of site template files 2013-03-13 21:27:41 +00:00
Jonathan Roes b71ec624f8 Add commands/new and scaffold post to gemspec so they get copied over. 2013-03-12 00:47:42 -04:00
Parker Moore 8886727bd8 Requiring safe_yaml ~> 0.7.0 because 0.8.x has weird bugs. 2013-03-11 22:17:19 +01:00
Parker Moore d361a70391 Merge pull request #807 from mojombo/safeyaml-warnings
Fix SafeYAML Warnings
2013-02-19 03:01:27 -08:00
Parker Moore ac8c7a0944 Relax Kramdown version to 0.14. Fixes #808. 2013-02-19 02:38:18 +01:00
Parker Moore 0c6d56365a Upgrading to safe_yaml v0.7 2013-02-10 19:07:05 +01:00
Aleksander Podlaski fae771d1a0 Remove migrator files from jekyll.gemspec
Some files no longer exists but was not removed from jekyll.gemspec:
- lib/jekyll/commands/migrate.rb 
- lib/jekyll/migrators/*.rb
2013-02-07 07:21:55 +01:00
Parker Moore e8384e6a97 Eliminating migrator dependencies. 2013-01-31 01:19:34 +01:00
Parker Moore 04b60ffe7f Merge pusewicz/bump-gems from #744 2013-01-30 23:20:23 +01:00
Parker Moore 2bc04e4a60 Added the site_template files to the gemspec manifest. 2013-01-27 23:16:34 +01:00
Ben Toews 1528cfe1cd adding safe_yaml to protect against object instantiation from yaml 2013-01-23 11:30:24 -06:00
Parker Moore 914f1e834d Added simplecov-gem-adapter dev dependency. 2013-01-20 22:15:44 -05:00
Parker Moore 065b251383 Added note in gemspec for easy extraction of dev dependencies to migrator gem. 2013-01-18 10:35:21 -05:00
Parker Moore f231ef7644 Merge pull request #684 from mattr-/issue-680. 2013-01-18 10:28:14 -05:00
Matt Rogers 06a6b8aadb Add simplecov as a dependency
Simplecov works with Ruby 1.9.x for generating test coverage
2013-01-16 22:18:10 -06:00
Parker Moore d9bc6b57d5 Updated gemspec to include new command and fixture files in manifest 2013-01-12 13:19:29 -08:00
Tom Bell b70b57cb89 Merge branch 'master' into 'jekyll-command-redux' 2013-01-09 23:40:27 +00:00
Piotr Usewicz 50b4a8c0ab Bump kramdown, rake, shoulda, cucumber, redcarpet 2013-01-09 10:29:40 +00:00
Tom Preston-Werner 95b07a3c2b Use Launchy for cross platform site:preview. Thx @ixti. 2012-12-29 15:29:56 -08:00
Tom Preston-Werner d58a0c1088 Release 0.12.0 2012-12-22 16:46:30 -07:00
Tom Bell 6c0c5b6187 Add commander dependency 2012-12-16 21:53:44 +00:00
Tom Preston-Werner 098da3d3fa Merge branch 'redcarpet-update' of https://github.com/tombell/jekyll into tombell-redcarpet-update 2012-12-15 14:09:55 -08:00