Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Merge 0.12.1 branch into master #866

Closed
wants to merge 9 commits into from

3 participants

@ab9

Is there a reason 0.12.1 hasn't been merged into the main development branch?

It's mainly a formality since many of the changes are already duplicated on master (e.g. changing :rubygems to https://rubygems.org in Gemfile). But it's a little strange that 0.12.1 doesn't appear in History.txt on master.

@parkr
Owner

We wanted to release a patch for Kramdown 0.14.x but not merge it into the main repo.

@parkr parkr closed this
@mojombo
Owner

@parkr It probably makes sense to just copy the 0.12.1 section from History.txt into the right place in that file on master, just so there's a record of it happening.

@parkr
Owner

@mojombo Fair enough. Done!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
View
2  Gemfile
@@ -1,2 +1,2 @@
-source :rubygems
+source "https://rubygems.org"
gemspec
View
8 History.txt
@@ -1,3 +1,11 @@
+== 0.12.1 / 2013-02-19
+ * Minor Enhancements
+ * Update Kramdown version to 0.14 (#744, #808)
+ * Test Enhancements
+ * Update Rake version to 10.0.3 (#744)
+ * Update Shoulda version to 3.3.2 (#744)
+ * Update Redcarpet version to 2.2.2 (#744)
+
== 0.12.0 / 2012-12-22
* Minor Enhancements
* Add ability to explicitly specify included files (#261)
View
14 jekyll.gemspec
@@ -4,9 +4,9 @@ Gem::Specification.new do |s|
s.rubygems_version = '1.3.5'
s.name = 'jekyll'
- s.version = '0.12.0'
+ s.version = '0.12.1'
s.license = 'MIT'
- s.date = '2012-12-22'
+ s.date = '2013-02-19'
s.rubyforge_project = 'jekyll'
s.summary = "A simple, blog aware, static site generator."
@@ -27,18 +27,18 @@ Gem::Specification.new do |s|
s.add_runtime_dependency('classifier', "~> 1.3")
s.add_runtime_dependency('directory_watcher', "~> 1.1")
s.add_runtime_dependency('maruku', "~> 0.5")
- s.add_runtime_dependency('kramdown', "~> 0.13.4")
+ s.add_runtime_dependency('kramdown', "~> 0.14")
s.add_runtime_dependency('pygments.rb', "~> 0.3.2")
- s.add_development_dependency('rake', "~> 0.9")
+ s.add_development_dependency('rake', "~> 10.0.3")
s.add_development_dependency('rdoc', "~> 3.11")
s.add_development_dependency('redgreen', "~> 1.2")
- s.add_development_dependency('shoulda', "~> 2.11")
+ s.add_development_dependency('shoulda', "~> 3.3.2")
s.add_development_dependency('rr', "~> 1.0")
- s.add_development_dependency('cucumber', "1.1")
+ s.add_development_dependency('cucumber', "~> 1.2.1")
s.add_development_dependency('RedCloth', "~> 4.2")
s.add_development_dependency('rdiscount', "~> 1.6")
- s.add_development_dependency('redcarpet', "~> 2.1.1")
+ s.add_development_dependency('redcarpet', "~> 2.2.2")
# = MANIFEST =
s.files = %w[
View
2  lib/jekyll.rb
@@ -46,7 +46,7 @@ def require_all(path)
require_all 'jekyll/tags'
module Jekyll
- VERSION = '0.12.0'
+ VERSION = '0.12.1'
# Default options. Overriden by values in _config.yml or command-line opts.
# Strings rather than symbols are used for compatability with YAML.
View
1  test/helper.rb
@@ -1,4 +1,5 @@
require 'rubygems'
+require 'test/unit'
gem 'RedCloth', '>= 4.2.1'
require 'jekyll'
View
4 test/test_kramdown.rb
@@ -23,11 +23,11 @@ class TestKramdown < Test::Unit::TestCase
should "convert quotes to smart quotes" do
markdown = MarkdownConverter.new(@config)
- assert_equal "<p>&ldquo;Pit&rsquo;hy&rdquo;</p>", markdown.convert(%{"Pit'hy"}).strip
+ assert_equal "<p>&#8220;Pit&#8217;hy&#8221;</p>", markdown.convert(%{"Pit'hy"}).strip
override = { 'kramdown' => { 'smart_quotes' => 'lsaquo,rsaquo,laquo,raquo' } }
markdown = MarkdownConverter.new(@config.deep_merge(override))
- assert_equal "<p>&laquo;Pit&rsaquo;hy&raquo;</p>", markdown.convert(%{"Pit'hy"}).strip
+ assert_equal "<p>&#171;Pit&#8250;hy&#187;</p>", markdown.convert(%{"Pit'hy"}).strip
end
end
end
Something went wrong with that request. Please try again.