Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu

This commit is contained in:
chris 2012-12-21 18:36:01 +08:00
commit 8381941d51
1 changed files with 4 additions and 1 deletions

View File

@ -1,5 +1,5 @@
source 'http://rubygems.org' source 'http://rubygems.org'
gem 'rails', '>=3.1.0', '<3.2.0' gem 'rails'
gem "brakeman" gem "brakeman"
gem 'mime-types' gem 'mime-types'
@ -47,6 +47,7 @@ gem 'social-share-button'
gem 'tinymce-rails' gem 'tinymce-rails'
gem 'therubyracer' if RUBY_PLATFORM.downcase.include?("linux") gem 'therubyracer' if RUBY_PLATFORM.downcase.include?("linux")
gem 'libv8', '~> 3.11.8' if RUBY_PLATFORM.downcase.include?("linux")
gem 'mongoid-encryptor', :require => 'mongoid/encryptor' gem 'mongoid-encryptor', :require => 'mongoid/encryptor'
gem 'rb-readline' if RUBY_PLATFORM.downcase.include?("linux") gem 'rb-readline' if RUBY_PLATFORM.downcase.include?("linux")
@ -92,3 +93,5 @@ group :test, :development do
# gem 'yard' # gem 'yard'
# gem "bluecloth" # gem "bluecloth"
end end
gem 'debugger'