Download as
Browse Code »

Commit 4182e50674d57f70a76d7b2735d413d5c74efad4

Authored by Joenio Costa
Committed by Antonio Terceiro
1 parent 69ce8240
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Fixing database.yml samples

Showing 2 changed files with 3 additions and 4 deletions   Show diff stats
config/database.yml.dist
  Diff comments   View file @4182e50
... ... @@ -20,7 +20,7 @@ development:
20 20 # Warning: The database defined as 'test' will be erased and
21 21 # re-generated from your development database when you run 'rake'.
22 22 # Do not set this db to the same as development or production.
23   -test:
  23 +test: &TEST
24 24 adapter: mysql
25 25 database: noosfero_test
26 26 username: root
... ...
config/database.yml.sqlite3
  Diff comments   View file @4182e50
... ... @@ -2,7 +2,7 @@ development:
2 2 adapter: sqlite3
3 3 database: db/development.db
4 4  
5   -test:
  5 +test: &TEST
6 6 adapter: sqlite3
7 7 database: db/test.db
8 8  
... ... @@ -11,5 +11,4 @@ production:
11 11 database: db/production.db
12 12  
13 13 cucumber:
14   - adapter: sqlite3
15   - database: db/test.db
  14 + <<: *TEST
... ...