Dmitriy Zaporozhets f438bd415f Merge branch 'master' into 6-0-dev ...

Conflicts:
	app/controllers/admin/teams/projects_controller.rb
	app/views/team_members/_team_member.html.haml
	app/views/teams/members/_member.html.haml

2013-06-30 11:35:40 +03:00

..

environments

Disable threadsafe! for rake tasks

2013-06-13 09:58:03 +03:00

initializers

Enable threadsafe. Preload lib/

2013-06-11 18:03:13 +03:00

locales

update devise gem

2013-02-28 21:06:16 +02:00

application.rb

Replace old hashes with new 1.9 ruby hashes (rebase)

2013-05-05 18:01:10 +04:00

aws.yml.example

Init aws support for file storage

2013-05-01 12:41:37 +03:00

boot.rb

init commit

2011-10-09 00:36:38 +03:00

database.yml.mysql

cattr_accessor is not threadsafe!

2013-06-11 18:15:18 +03:00

database.yml.postgresql

cattr_accessor is not threadsafe!

2013-06-11 18:15:18 +03:00

deploy.rb.example

deploys under git user

2013-02-20 17:11:41 -04:30

environment.rb

Use similar interface to access gitolite

2012-08-29 00:04:06 +03:00

gitlab.yml.example

whitespaces in gitlab.yml.example

2013-06-25 14:01:41 +03:00

puma.rb.example

Fixed puma.rb environment setting, no need to specify 'production' in daemon options now

2013-05-09 17:41:00 +01:00

resque.yml.example

Allow connection to Redis via unix socket

2013-03-06 22:06:12 +01:00

routes.rb

Remove unnecessary namespaced resource

2013-06-26 15:02:28 +03:00