Merge with new_blog

This commit is contained in:
chris2tof committed 2011-10-18 11:36:01 +08:00
1 parent 2e86d8081f
commit 64c68fcdeb
80 files changed
+906 -79

No files matched your search

+6 -6
View File
@@ -1,6 +1,6 @@
source 'http://rubygems.org'
gem 'rails'
gem 'rails'
gem 'yajl-ruby', :require => 'yajl'
gem 'bson_ext'
@@ -10,19 +10,19 @@ gem 'devise'
gem 'mini_magick'
gem 'rubyzip'
gem 'sinatra'
gem 'execjs'
gem 'mongoid'
gem 'rake', '>=0.9.2'
gem 'jquery-rails', '>= 1.0.3'
gem 'rake'
gem 'jquery-rails'
gem 'sprockets'
# Gems used only for assets and not required
# in production environments by default.
group :assets do
gem 'sass-rails', "~> 3.1.0.rc"
gem 'coffee-rails', "~> 3.1.0.rc"
gem 'sass-rails'
gem 'coffee-rails'
gem 'uglifier'
end