Move require to jekyll.rb and update history.

2011-03-10 21:15:29 -08:00 · 2011-03-10 21:15:29 -08:00 · a31780a1ec
parent 5f4dfe388f
commit a31780a1ec
3 changed files with 2 additions and 2 deletions
--- a/History.txt
+++ b/History.txt
@ -2,6 +2,7 @@
  * Minor Enhancements
    * Switch to Albino gem
    * Bundler support
+    * Use English library to avoid hoops (#292)
  * Bug Fixes
    * Secure additional path exploits

--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@ -19,6 +19,7 @@ require 'rubygems'
 require 'fileutils'
 require 'time'
 require 'yaml'
+require 'English'

 # 3rd party
 require 'liquid'
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@ -1,5 +1,3 @@
-require "English"
-
 # Convertible provides methods for converting a pagelike item
 # from a certain type of markup into actual content
 #