Vinnie Okada 2a9eed6620 Merge branch 'master' into rails-4.1.9 ... Conflicts: app/views/projects/commits/_commit.html.haml app/views/projects/issues/_issue.html.haml app/views/projects/issues/_issue_context.html.haml app/views/projects/merge_requests/_merge_request.html.haml app/views/projects/merge_requests/show/_context.html.haml		2015-02-21 12:55:28 -07:00
..
environments	Configure Redis cache for all environments	2014-08-26 13:44:39 +02:00
initializers	Change check to only swap static middleware when it's enabled.	2015-02-21 15:09:17 +01:00
locales	Doorkeeper integration	2014-12-24 15:38:07 +02:00
application.rb	Filter private_token and password_confirmation params from logs.	2015-02-06 22:55:43 +01: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	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	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	Remove settings from gitlab.yml.example which we already have in UI	2015-02-10 09:30:39 -08: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	Merge branch 'master' into rails-4.1.9	2015-02-21 12:55:28 -07: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