summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorSaito <saitowu@gmail.com>2011-12-29 11:51:33 +0800
committerSaito <saitowu@gmail.com>2011-12-29 11:52:28 +0800
commita25a85b9396cbc07bf2bfcd12d3c0a6685df66d6 (patch)
tree753393aee8de4de186679ee672d46beb270f9dbb /Gemfile
parent6e5caa19856a683e5e9ead5cda907cb4119762d6 (diff)
downloadgitlab-ce-a25a85b9396cbc07bf2bfcd12d3c0a6685df66d6.tar.gz
merge charlock_holmes to master
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 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"