diff --git a/Gemfile b/Gemfile
index 8342e1c3..5e528d45 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 2f4e4617..ef1fc0bd 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