deac/couchrest_model
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of git://github.com/tapajos/couchrest_model

Browse source 
Conflicts:
	Rakefile
	couchrest_model.gemspec
	history.txt
	lib/couchrest_model.rb
	spec/couchrest/attribute_protection_spec.rb
This commit is contained in:
Sam Lown 2010-08-24 11:45:37 +02:00
commit c32992c21b
12 changed files with 84 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/couchrest_model.rb
View file

@ -3,7 +3,9 @@ require 'couchrest'
gem "tzinfo", ">= 0.3.22"
gem 'railties', ">= 3.0.0.rc"
gem "activesupport", ">= 3.0.0.rc"
require 'active_support/core_ext'
require 'active_support/json'
@ -57,3 +59,4 @@ require "couchrest/model/base"
# Add rails support *after* everything has loaded
require "couchrest/railtie"