diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-06-26 17:36:38 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-06-26 17:36:38 +0000 |
| commit | 4fffc320d9c224931733a58646741c82b8b0f30f (patch) | |
| tree | 057f6965cf570446ce613cd5d31c5da3a233fee7 | |
| parent | 8c7a88d611269f79675a73b4a2653a8067918799 (diff) | |
| parent | e935d2ec9347b6ec65989ae78e3ffad7c26db453 (diff) | |
| download | gitlab-ce-4fffc320d9c224931733a58646741c82b8b0f30f.tar.gz | |
Merge branch 'sh-fix-premailer-gem-for-filesystem' into 'master'
Bump premailer-rails gem to 1.9.7 and its dependencies to prevent network retrieval of assets
Closes #34231
See merge request !12456
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 11 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-fix-premailer-gem-for-filesystem.yml | 5 |
3 files changed, 12 insertions, 6 deletions
@@ -256,7 +256,7 @@ gem 'base32', '~> 0.3.0' # Sentry integration gem 'sentry-raven', '~> 2.4.0' -gem 'premailer-rails', '~> 1.9.0' +gem 'premailer-rails', '~> 1.9.7' # I18n gem 'ruby_parser', '~> 3.8', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 7c9dd051211..817a1fd6aa3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -137,7 +137,7 @@ GEM crack (0.4.3) safe_yaml (~> 1.0.0) creole (0.5.0) - css_parser (1.4.1) + css_parser (1.5.0) addressable d3_rails (3.5.11) railties (>= 3.1.0) @@ -589,10 +589,11 @@ GEM websocket-driver (>= 0.2.0) posix-spawn (0.3.11) powerpack (0.1.1) - premailer (1.8.6) - css_parser (>= 1.3.6) + premailer (1.10.4) + addressable + css_parser (>= 1.4.10) htmlentities (>= 4.0.0) - premailer-rails (1.9.2) + premailer-rails (1.9.7) actionmailer (>= 3, < 6) premailer (~> 1.7, >= 1.7.9) prometheus-client-mmap (0.7.0.beta5) @@ -1045,7 +1046,7 @@ DEPENDENCIES peek-sidekiq (~> 1.0.3) pg (~> 0.18.2) poltergeist (~> 1.9.0) - premailer-rails (~> 1.9.0) + premailer-rails (~> 1.9.7) prometheus-client-mmap (~> 0.7.0.beta5) pry-byebug (~> 3.4.1) pry-rails (~> 0.3.4) diff --git a/changelogs/unreleased/sh-fix-premailer-gem-for-filesystem.yml b/changelogs/unreleased/sh-fix-premailer-gem-for-filesystem.yml new file mode 100644 index 00000000000..9e3c3e19bea --- /dev/null +++ b/changelogs/unreleased/sh-fix-premailer-gem-for-filesystem.yml @@ -0,0 +1,5 @@ +--- +title: Bump premailer-rails gem to 1.9.7 and its dependencies to prevent network retrieval + of assets +merge_request: +author: |