diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-01 15:34:04 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-07-01 15:34:04 +0000 |
| commit | b37a8d8f663d625a92fe06a15a89324bd23e239f (patch) | |
| tree | 8d40ee2f1e59a9f12c082bf116d86d68d757cd2a /spec/controllers/commit_controller_spec.rb | |
| parent | 984698dc968828495d6a1680231775924b0979d4 (diff) | |
| parent | eb70f051a6fb69542aa4436d808bf32271219da8 (diff) | |
| download | gitlab-ce-b37a8d8f663d625a92fe06a15a89324bd23e239f.tar.gz | |
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
Diffstat (limited to 'spec/controllers/commit_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions