gitlab-org--gitlab-foss/config
Dmitriy Zaporozhets f9ece12e87
Merge branch 'master' into oauth2_provider
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/layouts/nav/_profile.html.haml
2014-12-25 18:48:15 +02:00
..
environments
initializers Merge branch 'master' into oauth2_provider 2014-12-25 18:48:15 +02:00
locales Doorkeeper integration 2014-12-24 15:38:07 +02:00
application.rb Use new gitlab-shell v2.3.0 2014-11-18 17:15:51 +02:00
aws.yml.example
boot.rb
database.yml.mysql
database.yml.postgresql
environment.rb
gitlab.teatro.yml
gitlab.yml.example Update time zone rake task for production. Resolves #8387 2014-11-25 11:18:56 -07:00
newrelic.yml
resque.yml.example
routes.rb Rework oauth2 feature 2014-12-25 18:35:04 +02:00
unicorn.rb.example memory constrained unicorn workers 2014-12-08 14:21:17 +01:00
unicorn.rb.example.development