Douwe Maan ce1843b7de Merge branch 'master' into diff-line-comment-vuejs ... # Conflicts: # db/schema.rb		2016-07-28 16:57:42 -06:00
..
environments	Remove quiet_assets in favor of built-in sprockets-rails config.	2016-06-30 16:18:05 -06:00
initializers	Merge branch '20124-disable-repository-validation-during-precompile-step' into 'master'	2016-07-27 02:09:11 +00:00
locales	Minor fixes after a final look at the diff.	2016-05-11 10:30:47 +05:30
application.rb	Correctly resolves/unresolves discussions	2016-07-26 13:44:51 +01:00
aws.yml.example
boot.rb	Enable the Rubocop DeprecatedClassMethods cop	2016-05-08 15:33:34 -06:00
database.yml.env	Improving the "Environment variables" administration doc	2016-02-01 19:10:46 +01:00
database.yml.mysql
database.yml.postgresql
dependency_decisions.yml	Whitelist 'Simplified BSD' license	2016-07-26 15:25:15 -06:00
environment.rb	Rails update to 4.2.4	2015-11-25 18:18:44 +02:00
gitlab.yml.example	Update default path for repository_downloads_path in gitlab.yml.example	2016-07-21 10:31:49 -03:00
license_finder.yml	Resolve feedback.	2016-06-06 13:39:36 -06:00
mail_room.yml	Don't require Gitlab::Redis in mail_room.yml if it's already defined	2016-06-10 13:44:45 +02:00
newrelic.yml	Revert "Remove newrelic gem. Closes #12860"	2016-02-23 07:25:37 -08:00
resque.yml.example
routes.rb	Merge branch 'master' into diff-line-comment-vuejs	2016-07-28 16:57:42 -06:00
secrets.yml.example
sidekiq.yml.example	bug found by Charles Sibbald at Sky . Calls with patricio and Jacob confirmed this	2016-02-18 18:58:51 +00:00
unicorn.rb.example	Fix typos and grammar	2016-02-10 12:43:19 +02:00
unicorn.rb.example.development