summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNihad Abbasov <narkoz.2008@gmail.com>2012-05-29 17:22:26 +0500
committerNihad Abbasov <narkoz.2008@gmail.com>2012-05-29 17:22:26 +0500
commit078b312a31dc27c8b3107d8d9278e13e7b769892 (patch)
treed7431ae94187061452c77055fb0075c7ba06a956
parentfaa0ec7c634bdf394b67366e8f90fb4c5a40542d (diff)
downloadgitlab-ce-078b312a31dc27c8b3107d8d9278e13e7b769892.tar.gz
cleanup Gemfile
-rw-r--r--Gemfile4
-rw-r--r--Gemfile.lock2
2 files changed, 1 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index 8342e1c353e..5e528d4540b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,18 +4,15 @@ gem "rails", "3.2.3"
gem "sqlite3"
gem "mysql2"
-gem "rake"
gem "devise", "~> 1.5"
gem "stamp"
gem "kaminari"
-gem "haml", "3.1.4"
gem "haml-rails"
gem "jquery-rails"
gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "810e3c11787e9d84c5925a7edc3264db0f04bb49"
gem "gitolite", :git => "https://github.com/gitlabhq/gitolite-client.git", :ref => "9b715ca8bab6529f6c92204a25f84d12f25a6eb0"
gem "carrierwave"
gem "six"
-gem "therubyracer"
gem "faker"
gem "seed-fu"
gem "linguist", "~> 1.0.0", :git => "https://github.com/gitlabhq/linguist.git"
@@ -42,6 +39,7 @@ group :assets do
gem "sass-rails", "3.2.3"
gem "coffee-rails", "3.2.2"
gem "uglifier", "1.0.3"
+ gem "therubyracer"
end
group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index 2f4e4617ce6..ef1fc0bd11f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -342,7 +342,6 @@ DEPENDENCIES
git
gitolite!
grit!
- haml (= 3.1.4)
haml-rails
httparty
jquery-rails
@@ -357,7 +356,6 @@ DEPENDENCIES
pygments.rb (= 0.2.12)!
rails (= 3.2.3)
rails-footnotes
- rake
redcarpet (~> 2.1.1)
resque (~> 1.20.0)
resque_mailer