diff options
| author | Saito <saitowu@gmail.com> | 2011-12-30 18:30:57 +0800 |
|---|---|---|
| committer | Saito <saitowu@gmail.com> | 2011-12-30 18:30:57 +0800 |
| commit | 7279e8c1774f3116dd74ca462447189730f9eff8 (patch) | |
| tree | 438c5671951a2a01e1484c3a3bb099a1d26eb162 /Gemfile.lock | |
| parent | 5719f02f34339237a2b1faeda30976a404358910 (diff) | |
| download | gitlab-ce-7279e8c1774f3116dd74ca462447189730f9eff8.tar.gz | |
Revert "merge charlock_holmes to master"
This reverts commit a25a85b9396cbc07bf2bfcd12d3c0a6685df66d6.
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 86a69981004..09fecb8878e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -77,7 +77,6 @@ GEM xpath (~> 0.1.4) carrierwave (0.5.8) activesupport (~> 3.0) - charlock_holmes (0.6.8) childprocess (0.2.2) ffi (~> 1.0.6) coffee-rails (3.1.1) @@ -173,6 +172,7 @@ GEM rdoc (~> 3.4) thor (~> 0.14.6) rake (0.9.2.2) + rchardet19 (1.3.5) rdiscount (1.6.8) rdoc (3.11) json (~> 1.4) @@ -285,7 +285,6 @@ DEPENDENCIES awesome_print capybara carrierwave - charlock_holmes coffee-rails (~> 3.1.0) database_cleaner devise (= 1.5.0) @@ -303,6 +302,7 @@ DEPENDENCIES pygments.rb (= 0.2.3) rails (= 3.1.1) rails-footnotes (~> 3.7.5) + rchardet19 (~> 1.3.5) rdiscount resque rspec-rails |