Robert Speicher b37a8d8f66 Merge branch 'upgrade-sprockets-rails' into 'master' ...

Upgrade sprockets and sprockets rails, remove quiet_assets

## What does this MR do?

Upgrade Sprockets from 3.6.0 to 3.6.2.

Changelog: https://github.com/rails/sprockets/blob/3.x/CHANGELOG.md

Upgrade Sprockets Rails from 3.0.4 to 3.1.1.

Changelog: https://github.com/rails/sprockets-rails/compare/v3.0.4...v3.1.1

quiet_assets has been seemingly abandoned, and now sprockets-rails has the feature built-in!

The config was added in this PR: https://github.com/rails/sprockets-rails/pull/355

Working towards #14286.

See merge request !5029

2016-07-01 15:34:04 +00:00

..

environments

Remove quiet_assets in favor of built-in sprockets-rails config.

2016-06-30 16:18:05 -06:00

initializers

Metrics for Rouge::Plugins::Redcarpet and Rouge::Formatters::HTMLGitlab

2016-07-01 12:34:28 +02:00

locales

Minor fixes after a final look at the diff.

2016-05-11 10:30:47 +05:30

application.rb

Add precompilation for relevant assets.

2016-06-23 11:05:02 -06:00

aws.yml.example

Add a note that changing example configuration files requires changing omnibus-gitlab.

2015-06-11 15:11:37 +02:00

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

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

dependency_decisions.yml

Loop all disks when displaying system info

2016-06-29 16:02:12 -04:00

environment.rb

Rails update to 4.2.4

2015-11-25 18:18:44 +02:00

gitlab.teatro.yml

Refactor repository paths handling to allow multiple git mount points

2016-06-29 22:30:31 -04:00

gitlab.yml.example

Refactor repository paths handling to allow multiple git mount points

2016-06-29 22:30:31 -04: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

Add a note that changing example configuration files requires changing omnibus-gitlab.

2015-06-11 15:11:37 +02:00

routes.rb

Import from Github using Personal Access Tokens.

2016-06-30 18:48:17 +02:00

secrets.yml.example

Groundwork for merging CI into CE

2015-08-25 18:42:46 -07:00

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

Increase unicorn timeout to 60 seconds

2014-09-23 17:11:16 +03:00