Vinnie Okada 9e9ce95d62 Merge branch 'master' into rails-4.1.9 ... Conflicts: app/views/dashboard/_project.html.haml app/views/events/event/_common.html.haml app/views/explore/projects/_project.html.haml app/views/groups/_projects.html.haml app/views/projects/_home_panel.html.haml app/views/projects/_issues_nav.html.haml app/views/projects/issues/_discussion.html.haml app/views/projects/issues/_issues.html.haml app/views/projects/issues/show.html.haml app/views/projects/merge_requests/_discussion.html.haml app/views/projects/merge_requests/_show.html.haml app/views/projects/milestones/index.html.haml app/views/projects/notes/_edit_form.html.haml app/views/shared/_issuable_filter.html.haml		2015-02-19 20:53:05 -07:00
..
environments	Configure Redis cache for all environments	2014-08-26 13:44:39 +02:00
initializers	Add link to share via twitter to "created project" event.	2015-02-13 12:07:59 +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
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	Upgrade to Rails 4.1.9	2015-02-14 11:09:23 -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