gitlab-org--gitlab-foss/config
Robert Speicher 0a250cf9eb Merge branch 'rails-5-backports' into 'master'
Fix two problematic bits of code that will be deprecated or broken in Rails 5.

Found in the Rails 5 MR: !5555

These are safe to use in Rails 4.2.7 as well as Rails 5.0.0, so I figured I'd backport them for the sake of making that merge request smaller.

The explanation for the mime_types.rb code is here: https://github.com/rails-api/active_model_serializers/issues/1027#issuecomment-126543577

See merge request !6214
2016-09-12 21:02:57 +00:00
..
environments Remove quiet_assets in favor of built-in sprockets-rails config. 2016-06-30 16:18:05 -06:00
initializers Merge branch 'rails-5-backports' into 'master' 2016-09-12 21:02:57 +00:00
locales Minor fixes after a final look at the diff. 2016-05-11 10:30:47 +05:30
application.rb Merge branch 'ace-ventura' into 'master' 2016-08-19 17:06:30 +00: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 Synced mail_room.yml with the one in omnibus 2016-08-04 18:55:37 +02:00
newrelic.yml Revert "Remove newrelic gem. Closes #12860" 2016-02-23 07:25:37 -08:00
resque.yml.example Added Redis Sentinel support documentation 2016-08-04 18:55:37 +02:00
routes.rb Make merge requests bulk update working 2016-09-08 11:52:20 +03: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