Merge remote branch 'core/resthome' into one-oh

cykod · Dec 3, 2010 · 67d40c5 · 67d40c5
2 parents 38d11c3 + f95a949
commit 67d40c5
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 399 deletions.
diff --git a/config/environment.rb b/config/environment.rb
@@ -100,6 +100,8 @@ def webiva_remove_load_paths(file)
   config.gem "json"
   config.gem "httparty"
   config.gem "fastercsv"
+  config.gem "httparty"
+  config.gem "resthome"
 
   if RAILS_ENV == 'test'
     config.gem 'factory_girl',:source => 'http://gemcutter.org'

diff --git a/lib/active_web_service.rb b/lib/active_web_service.rb