Merge branch 'master' of https://github.com/imathis/octopress into so…

…urce

Gemfile

@@ -11,7 +11,6 @@ group :development do
   gem 'haml', '~> 4.0'
   gem 'compass', '~> 1.0.1'
   gem 'sass-globbing', '~> 1.0.0'
-  gem 'rubypants', '~> 0.2.0'
   gem 'rb-fsevent', '~> 0.9'
   gem 'stringex', '~> 1.4.0'
 end

README.markdown

@@ -23,7 +23,7 @@ fix to our docs repo](https://github.com/octopress/docs).
 
 ## Contributing
 
-[![Build Status](https://travis-ci.org/imathis/octopress.png?branch=master)](https://travis-ci.org/imathis/octopress)
+[![Build Status](https://travis-ci.org/imathis/octopress.svg?branch=master)](https://travis-ci.org/imathis/octopress)
 
 We love to see people contributing to Octopress, whether it's a bug report, feature suggestion or a pull request. At the moment, we try to keep the core slick and lean, focusing on basic blogging needs, so some of your suggestions might not find their way into Octopress. For those ideas, we started a [list of 3rd party plug-ins](https://github.com/imathis/octopress/wiki/3rd-party-plugins), where you can link your own Octopress plug-in repositories. For the future, we're thinking about ways to easier add them into our main releases.
 

plugins/octopress_filters.rb

@@ -4,7 +4,6 @@
 require 'jekyll-sitemap'
 require 'octopress-date-format'
 require './plugins/raw'
-require 'rubypants'
 
 module OctopressFilters
   def self.pre_filter(page)
@@ -19,8 +18,6 @@ def self.post_filter(page)
     if page.ext.match('html|textile|markdown|md|haml|slim|xml')
       page.output = TemplateWrapper::unwrap(page.output)
     end
-
-    page.output = RubyPants.new(page.output).to_html
   end
 
   class PageFilters < Octopress::Hooks::Page

plugins/raw.rb

@@ -8,7 +8,7 @@ def self.safe_wrap(input)
   end
   # This must be applied after the
   def self.unwrap(input)
-    input.gsub /<div class='bogus-wrapper'><notextile>(.+?)<\/notextile><\/div>/m do
+    input.gsub /<div class=['"]bogus-wrapper['"]><notextile>(.+?)<\/notextile><\/div>/m do
       $1
     end
   end