diff options
| author | Saito <saitowu@gmail.com> | 2011-12-29 11:51:33 +0800 |
|---|---|---|
| committer | Saito <saitowu@gmail.com> | 2011-12-29 11:52:28 +0800 |
| commit | a25a85b9396cbc07bf2bfcd12d3c0a6685df66d6 (patch) | |
| tree | 753393aee8de4de186679ee672d46beb270f9dbb /Gemfile.lock | |
| parent | 6e5caa19856a683e5e9ead5cda907cb4119762d6 (diff) | |
| download | gitlab-ce-a25a85b9396cbc07bf2bfcd12d3c0a6685df66d6.tar.gz | |
merge charlock_holmes to master
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 09fecb8878e..86a69981004 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -77,6 +77,7 @@ 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) @@ -172,7 +173,6 @@ 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,6 +285,7 @@ DEPENDENCIES awesome_print capybara carrierwave + charlock_holmes coffee-rails (~> 3.1.0) database_cleaner devise (= 1.5.0) @@ -302,7 +303,6 @@ DEPENDENCIES pygments.rb (= 0.2.3) rails (= 3.1.1) rails-footnotes (~> 3.7.5) - rchardet19 (~> 1.3.5) rdiscount resque rspec-rails |