Merge branch '2.1' into site-2.1

Gemfile

@@ -1,18 +1,18 @@
 source "http://rubygems.org"
 
 group :development do
-  gem 'rake'
-  gem 'rack'
-  gem 'jekyll', '~> 0.11'
-  gem 'rdiscount'
-  gem 'pygments.rb'
-  gem 'RedCloth'
-  gem 'haml', '~> 3.1'
-  gem 'compass', '~> 0.12'
-  gem 'rubypants'
+  gem 'rake', '~> 0.9.2'
+  gem 'rack', '~> 1.4.1'
+  gem 'jekyll', '~> 0.11.2'
+  gem 'rdiscount', '~> 1.6.8'
+  gem 'pygments.rb', '~> 0.2.12'
+  gem 'RedCloth', '~> 4.2.9'
+  gem 'haml', '~> 3.1.6'
+  gem 'compass', '~> 0.12.1'
+  gem 'rubypants', '~> 0.2.0'
   gem 'rb-fsevent', '~> 0.9'
-  gem 'stringex'
-  gem 'liquid', '~> 2.3'
+  gem 'stringex', '~> 1.4.0'
+  gem 'liquid', '~> 2.3.0'
 end
 
-gem 'sinatra', '~> 1.3'
+gem 'sinatra', '~> 1.3.2'

Gemfile.lock

@@ -1,69 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    RedCloth (4.2.9)
-    albino (1.3.3)
-      posix-spawn (>= 0.3.6)
-    blankslate (2.1.2.4)
-    chunky_png (1.2.5)
-    classifier (1.3.3)
-      fast-stemmer (>= 1.0.0)
-    compass (0.12.1)
-      chunky_png (~> 1.2)
-      fssm (>= 0.2.7)
-      sass (~> 3.1)
-    directory_watcher (1.4.1)
-    fast-stemmer (1.0.1)
-    ffi (1.0.11)
-    fssm (0.2.9)
-    haml (3.1.6)
-    jekyll (0.11.2)
-      albino (~> 1.3)
-      classifier (~> 1.3)
-      directory_watcher (~> 1.1)
-      kramdown (~> 0.13)
-      liquid (~> 2.3)
-      maruku (~> 0.5)
-    kramdown (0.13.6)
-    liquid (2.3.0)
-    maruku (0.6.0)
-      syntax (>= 1.0.0)
-    posix-spawn (0.3.6)
-    pygments.rb (0.2.12)
-      rubypython (~> 0.5.3)
-    rack (1.4.1)
-    rack-protection (1.2.0)
-      rack
-    rake (0.9.2.2)
-    rb-fsevent (0.9.1)
-    rdiscount (1.6.8)
-    rubypants (0.2.0)
-    rubypython (0.5.3)
-      blankslate (>= 2.1.2.3)
-      ffi (~> 1.0.7)
-    sass (3.1.18)
-    sinatra (1.3.2)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    stringex (1.4.0)
-    syntax (1.0.0)
-    tilt (1.3.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  RedCloth
-  compass (~> 0.12)
-  haml (~> 3.1)
-  jekyll (~> 0.11)
-  liquid (~> 2.3)
-  pygments.rb
-  rack
-  rake
-  rb-fsevent (~> 0.9)
-  rdiscount
-  rubypants
-  sinatra (~> 1.3)
-  stringex

plugins/rubypants.rb

@@ -401,8 +401,8 @@ class RubyPants < String
     # Special case if the very first character is a quote followed by
     # punctuation at a non-word-break. Close the quotes by brute
     # force:
-    str.gsub!(/^'(?=#{punct_class}\B)/, '&#8217;')
-    str.gsub!(/^"(?=#{punct_class}\B)/, '&#8221;')
+    str.gsub!(/^'(?=#{punct_class}\B)/o, '&#8217;')
+    str.gsub!(/^"(?=#{punct_class}\B)/o, '&#8221;')
 
     # Special case for double sets of quotes, e.g.:
     #   <p>He said, "'Quoted' words in a larger quote."</p>
@@ -416,19 +416,19 @@ class RubyPants < String
     dec_dashes = '&#8211;|&#8212;'
 
     # Get most opening single quotes:
-    str.gsub!(/(\s|&nbsp;|--|&[mn]dash;|#{dec_dashes}|&#x201[34];)'(?=\w)/,
+    str.gsub!(/(\s|&nbsp;|--|&[mn]dash;|#{dec_dashes}|&#x201[34];)'(?=\w)/o,
              '\1&#8216;')
     # Single closing quotes:
-    str.gsub!(/(#{close_class})'/, '\1&#8217;')
+    str.gsub!(/(#{close_class})'/o, '\1&#8217;')
     str.gsub!(/'(\s|s\b|$)/, '&#8217;\1')
     # Any remaining single quotes should be opening ones:
     str.gsub!(/'/, '&#8216;')
 
     # Get most opening double quotes:
-    str.gsub!(/(\s|&nbsp;|--|&[mn]dash;|#{dec_dashes}|&#x201[34];)"(?=\w)/,
+    str.gsub!(/(\s|&nbsp;|--|&[mn]dash;|#{dec_dashes}|&#x201[34];)"(?=\w)/o,
              '\1&#8220;')
     # Double closing quotes:
-    str.gsub!(/(#{close_class})"/, '\1&#8221;')
+    str.gsub!(/(#{close_class})"/o, '\1&#8221;')
     str.gsub!(/"(\s|s\b|$)/, '&#8221;\1')
     # Any remaining quotes should be opening ones:
     str.gsub!(/"/, '&#8220;')