Bryce Johnson 80aa0a8f86 Revert conflict resolution in routes.rb.		2016-10-15 08:28:54 +02:00
..
environments	Remove quiet_assets in favor of built-in sprockets-rails config.	2016-06-30 16:18:05 -06:00
initializers	Precalculate trending projects	2016-10-10 12:27:08 +02:00
locales
routes	Merge branch 'issue-23306-fix' into 'master'	2016-10-14 12:25:56 +00:00
application.rb	Merge commit 'dev/security' into 'master'	2016-10-06 08:33:11 +02:00
aws.yml.example
boot.rb
database.yml.env
database.yml.mysql
database.yml.postgresql
dependency_decisions.yml	Whitelist 'Simplified BSD' license	2016-07-26 15:25:15 -06:00
environment.rb
gitlab.yml.example	Merge branch 'docs/refactor-reply-by-email' into 'master'	2016-10-11 13:27:23 +00:00
license_finder.yml
mail_room.yml	Synced mail_room.yml with the one in omnibus	2016-08-04 18:55:37 +02:00
newrelic.yml
resque.yml.example	Added Redis Sentinel support documentation	2016-08-04 18:55:37 +02:00
routes.rb	Revert conflict resolution in routes.rb.	2016-10-15 08:28:54 +02:00
secrets.yml.example
sidekiq.yml.example
unicorn.rb.example
unicorn.rb.example.development