Skip to content

Commit

Permalink
Set ruby1.9 as default for the database configuration example.
Browse files Browse the repository at this point in the history
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11204 e93f8b46-1217-0410-a6f0-8f06a7374b81
  • Loading branch information
jplang committed Jan 19, 2013
1 parent 513419d commit 1188789
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions config/database.yml.example
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# Default setup is given for MySQL with ruby1.8. If you're running Redmine
# with MySQL and ruby1.9, replace the adapter name with `mysql2`.
# Default setup is given for MySQL with ruby1.9. If you're running Redmine
# with MySQL and ruby1.8, replace the adapter name with `mysql`.
# Examples for PostgreSQL and SQLite3 can be found at the end.

production:
adapter: mysql
adapter: mysql2
database: redmine
host: localhost
username: root
password: ""
encoding: utf8

development:
adapter: mysql
adapter: mysql2
database: redmine_development
host: localhost
username: root
Expand All @@ -22,7 +22,7 @@ development:
# re-generated from your development database when you run "rake".
# Do not set this db to the same as development or production.
test:
adapter: mysql
adapter: mysql2
database: redmine_test
host: localhost
username: root
Expand Down
6 changes: 3 additions & 3 deletions doc/INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ Optional:
2. Create an empty utf8 encoded database: "redmine" for example

3. Configure the database parameters in config/database.yml
for the "production" environment (default database is MySQL and ruby1.8)
for the "production" environment (default database is MySQL and ruby1.9)

If you're running Redmine with MySQL and ruby1.9, replace the adapter name
with `mysql2`
If you're running Redmine with MySQL and ruby1.8, replace the adapter name
with `mysql`

4. Install the required gems by running:
bundle install --without development test
Expand Down

0 comments on commit 1188789

Please sign in to comment.