NTU CPH initiated

Conflicts: config/mongoid.yml
2013-10-09 10:21:37 +08:00 · 2013-10-09 10:21:37 +08:00 · 7ed2afb405
parent 20e2f07b26
commit 7ed2afb405
1 changed files with 3 additions and 5 deletions
--- 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