MrZYX 84ae3e6b96 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca

2011-07-01 00:11:06 +02:00

..

deploy

Make cap deploy follow a branch in deploy_config.yml

2011-02-09 16:07:24 -08:00

environments

Multi-server integration tests are now possible

2011-05-25 15:16:14 -07:00

initializers

Faraday follows redirects

2011-06-22 12:53:18 -07:00

locales

Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca

2011-07-01 00:11:06 +02:00

application.rb

Fix migration for ruby 1.9. Move YAML check into application.rb, and add guard for ruby 1.8.x.

2011-06-04 20:12:34 -07:00

application.yml.example

Merge branch 'master' into oauth

2011-06-28 17:13:38 -07:00

assets.yml

Merge branch 'master' into oauth

2011-06-28 17:13:38 -07:00

boot.rb

Fix migration for ruby 1.9. Move YAML check into application.rb, and add guard for ruby 1.8.x.

2011-06-04 20:12:34 -07:00

cucumber.yml

suburi cucumber test.

2010-12-29 10:31:25 +01:00

database.yml.example

improved database.yml.example

2011-04-30 00:56:35 +02:00

deploy_config.yml.example

Update cap scripts to have separate staging and production environments, use bundler

2011-01-31 15:28:43 -08:00

deploy.rb

Deploy correct symlink for config file

2011-06-01 10:31:11 -07:00

environment.rb

Fix search in PG

2011-06-22 15:09:00 -07:00

locale_settings.yml

added es-AR

2011-06-01 23:55:48 +02:00

oauth_keys.yml.example

since we try and init tumblr, we need to set it as empty...annoying

2011-06-01 23:33:16 -07:00

redis.yml

Revert "Revert redis merge to fix bugs on master"

2010-12-02 15:33:26 -08:00

routes.rb

Merge branch 'master' into oauth

2011-06-28 17:13:38 -07:00

script_server_config.yml.example

user can now disable thin and use ./script/server to fire up resque and websocket only

2011-05-29 16:11:29 +02:00

selenium.yml

Add or later to license notice

2010-10-07 16:25:34 -07:00

thin.yml

Add or later to license notice

2010-10-07 16:25:34 -07:00