merge:

[pettanr/pettanr.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 9890790..90b68a2 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -4,12 +4,12 @@ gem 'rails', '~> 3.2.0'
 gem 'devise', '=1.5.2'
 gem 'rest-client'
 gem 'underscore-rails'
-gem 'backbone-rails'
+# gem 'backbone-rails'
 gem 'rails-timeago'
 gem 'kaminari'
 gem 'sanitize'
 gem 'aws-s3'
-gem 'awesome_nested_set'
+gem 'awesome_nested_set', '~> 2.0'
 gem 'validates_existence'
 gem "validate_url"
 gem "pettanr_creative_commons_v30_licenses"
@@ -34,6 +34,8 @@ group :assets do
   gem 'sass-rails',   '~> 3.0'
   gem 'coffee-rails', '~> 3.0'
   gem 'uglifier', '>= 1.0.3'
+  # http://qiita.com/scivola/items/ec7625118fcf6de5203a
+  gem 'coffee-script-source', '~> 1.8.0'
 end
 
 gem 'jquery-rails'
@@ -55,6 +57,7 @@ gem 'bcrypt-ruby', '~> 3.0.0'
 group :production do
   gem 'pg'
   gem 'therubyracer-heroku'
+  #gem 'therubyracer'
 end
 
 group :mgk do
@@ -66,7 +69,7 @@ group :development, :test do
   gem 'webrat'
   gem 'moro-miso'
   gem 'database_cleaner'
-  gem 'rails-erd'
+  #gem 'rails-erd'
 end
 
 group :test do