gitlab-org--gitlab-foss/config
Dmitriy Zaporozhets e21ca9f8b1
Merge branch 'star' of https://github.com/cirosantilli/gitlabhq into cirosantilli-star
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-07-24 10:54:42 +03:00
..
environments Fix dev env. Fix MR creation 2014-06-26 18:40:13 +03:00
initializers Add support to set satellites timeout 2014-07-21 11:50:29 -04:00
locales Update to accomodate devise deprecations and backward incompatible changes. 2014-07-10 13:56:35 +02:00
application.rb Remove protected_atrributes gem and start moving to strong params 2014-06-26 14:30:07 +03: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 Disable connection reaping for MySQL 2014-04-07 12:32:24 +02:00
database.yml.postgresql Remove 'socket' example PostgreSQL parameter 2014-07-01 18:27:50 +02:00
environment.rb Use similar interface to access gitolite 2012-08-29 00:04:06 +03:00
gitlab.teatro.yml teatro setup 2014-06-17 11:21:49 +03:00
gitlab.yml.example Merge pull request #7316 from ayr-ton/master 2014-07-23 19:17:31 +03:00
resque.yml.example Allow connection to Redis via unix socket 2013-03-06 22:06:12 +01:00
routes.rb Merge branch 'star' of https://github.com/cirosantilli/gitlabhq into cirosantilli-star 2014-07-24 10:54:42 +03:00
unicorn.rb.example Describe unicorn timeout value in git over http 2014-06-11 22:53:42 +03:00
unicorn.rb.example.development Update development steps. 2014-04-08 11:17:19 +02:00