From 7ed2afb405ed9bb9f5fd46f10ede89d61c92c312 Mon Sep 17 00:00:00 2001
From: saurabhbhatia <saurabh.a.bhatia@gmail.com>
Date: Wed, 9 Oct 2013 10:21:37 +0800
Subject: [PATCH] NTU CPH initiated

Conflicts:
	config/mongoid.yml
---
 config/mongoid.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/config/mongoid.yml b/config/mongoid.yml
index ebfecd6ef..0ebe8e531 100644
--- a/config/mongoid.yml
+++ b/config/mongoid.yml
@@ -8,13 +8,11 @@ defaults: &defaults
 
 development:
   <<: *defaults
-  database: test_site
-
-
+  database: ntu_cph_orbit
 
 test:
   <<: *defaults
-  database: test_site
+  database: ntu_cph_orbit
 
 # set these environment variables on your prod server
 production:
@@ -24,4 +22,4 @@ production:
   # password: <%= ENV['MONGOID_PASSWORD'] %>
   # database: <%= ENV['MONGOID_DATABASE'] %>
   <<: *defaults
-  database: orbit_site_new
+  database: ntu_cph_orbit