summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaito <saitowu@gmail.com>2011-12-30 22:25:45 +0800
committerSaito <saitowu@gmail.com>2011-12-30 22:25:45 +0800
commit26deb7e0b580ca402ffd93d1991381f580447973 (patch)
tree2e273d0b7bf06804d2b8c9cff41cbbb75fd3af64
parent14023c4e5a3241d06a8a021bab1183e4a9742b28 (diff)
downloadgitlab-ce-26deb7e0b580ca402ffd93d1991381f580447973.tar.gz
add charlock_holmes gem
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 3c7b1a4f91f..e240fa65b91 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,9 +22,9 @@ gem "acts_as_list"
gem "rdiscount"
gem "acts-as-taggable-on", "~> 2.1.0"
gem "drapper"
-gem "rchardet19", "~> 1.3.5"
gem "resque"
gem "httparty"
+gem "charlock_holmes"
group :assets do
gem "sass-rails", "~> 3.1.0"
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