Merge branch 'feature/install' into feature/community_core_release

Conflicts:
	plugin_config.yml
pull/1/head
Romano Licker 12 years ago
commit 76bb4f834b
  1. 10
      config/database.yml.example
  2. 5
      plugin_config.yml

@ -2,15 +2,15 @@
production:
adapter: mysql
database: chiliproject
database: openproject
host: localhost
username: root
password:
encoding: utf8
development:
adapter: mysql
database: chiliproject_development
database: openproject_development
host: localhost
username: root
password:
@ -21,7 +21,7 @@ development:
# Do not set this db to the same as development or production.
test:
adapter: mysql
database: chiliproject_test
database: openproject_test
host: localhost
username: root
password:
@ -29,7 +29,7 @@ test:
test_pgsql:
adapter: postgresql
database: chiliproject_test
database: openproject_test
host: localhost
username: postgres
password: "postgres"

@ -2,7 +2,7 @@
plugins/chiliproject_activity_module:
repository: "git@github.com:finnlabs/chiliproject_activity_module.git"
branch: master
plugins/chiliproject_help_link:
plugins/help_link:
repository: "git@github.com:finnlabs/help_link.git"
branch: master
plugins/numbered_headings:
@ -11,7 +11,7 @@ plugins/numbered_headings:
plugins/redmine_checkout:
repository: "git@github.com:finnlabs/redmine_checkout.git"
branch: master
plugins/redmine_customize_modules:
plugins/customize_modules:
repository: "git@github.com:finnlabs/customize_modules.git"
branch: master
plugins/redmine_favicon:
@ -20,3 +20,4 @@ plugins/redmine_favicon:
plugins/memcached_passenger:
repository: "git@github.com:finnlabs/memcached_passenger.git"
branch: master

Loading…
Cancel
Save