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	Configure Redis cache for all environments	2014-08-26 13:44:39 +02:00
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	set the collation to utf8_general_ci	2014-08-13 14:45:23 +01:00
database.yml.postgresql	Remove 'socket' example PostgreSQL parameter	2014-07-01 18:27:50 +02:00
environment.rb
gitlab.teatro.yml	teatro setup	2014-06-17 11:21:49 +03:00
gitlab.yml.example	Update time zone rake task for production. Resolves #8387	2014-11-25 11:18:56 -07:00
newrelic.yml	Add dormant New Relic gem	2014-09-16 17:31:20 +02:00
resque.yml.example	Use sockets to connect to Redis	2014-09-12 14:59:58 +02:00
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	Increase unicorn timeout to 60 seconds	2014-09-23 17:11:16 +03:00