diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-04-09 23:08:43 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-04-09 23:08:43 +0000 |
| commit | a2303417d02e2ec5b335dff6ae1e76200c811ca9 (patch) | |
| tree | d04d5a5117fb22e6475621b41656325397938980 | |
| parent | 593972ca6a551a242b4e1e0e4bb7c25dbc7974ad (diff) | |
| parent | 44d9f52fd9dba09c352f64bb742291e5adab423a (diff) | |
| download | gitlab-ce-a2303417d02e2ec5b335dff6ae1e76200c811ca9.tar.gz | |
Merge branch 'enable-compress-in-production' into 'master'
Enable asset compression in production.
`config.assets.compress` needed to be explicitly enabled.
Follow-up to !3544. Resolves #14344.
See merge request !3632
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | config/environments/production.rb | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index c25ee3c71d3..b5dcc8bc8a7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.7.0 (unreleased) + - Enable gzip for assets, makes the page size significantly smaller. !3544 / !3632 (Connor Shea) - Load award emoji images separately unless opening the full picker. Saves several hundred KBs of data for most pages. (Connor Shea) - All images in discussions and wikis now link to their source files !3464 (Connor Shea). - Return status code 303 after a branch DELETE operation to avoid project deletion (Stan Hu) diff --git a/config/environments/production.rb b/config/environments/production.rb index 909526605a1..a9d8ac4b6d4 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -21,6 +21,9 @@ Rails.application.configure do # Generate digests for assets URLs config.assets.digest = true + # Enable compression of compiled assets using gzip. + config.assets.compress = true + # Defaults to nil and saved in location specified by config.assets.prefix # config.assets.manifest = YOUR_PATH |