From c089ebc696bf0c6cd564577e5df8491200b79418 Mon Sep 17 00:00:00 2001
From: Heinrich Lee Yu <heinrich@gitlab.com>
Date: Wed, 23 Oct 2019 04:36:43 +0800
Subject: [PATCH] Upgrade premailer-rails and related dependencies
---
Gemfile | 2 +-
Gemfile.lock | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Gemfile b/Gemfile
index 4c077e7139791..1d03c38854985 100644
--- a/Gemfile
+++ b/Gemfile
@@ -296,7 +296,7 @@ gem 'rack-attack', '~> 6.2.0'
# Sentry integration
gem 'sentry-raven', '~> 2.9'
-gem 'premailer-rails', '~> 1.9.7'
+gem 'premailer-rails', '~> 1.10.3'
# LabKit: Tracing and Correlation
gem 'gitlab-labkit', '~> 0.5'
diff --git a/Gemfile.lock b/Gemfile.lock
index 5031007ef1dbc..5d9e9b50ca0d0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -175,7 +175,7 @@ GEM
safe_yaml (~> 1.0.0)
crass (1.0.5)
creole (0.5.0)
- css_parser (1.5.0)
+ css_parser (1.7.0)
addressable
daemons (1.2.6)
danger (6.0.9)
@@ -584,7 +584,7 @@ GEM
mime-types-data (3.2019.0331)
mimemagic (0.3.2)
mini_magick (4.9.5)
- mini_mime (1.0.1)
+ mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.11.3)
msgpack (1.3.1)
@@ -703,12 +703,12 @@ GEM
pg (1.1.4)
po_to_json (1.0.1)
json (>= 1.6.0)
- premailer (1.10.4)
+ premailer (1.11.1)
addressable
- css_parser (>= 1.4.10)
+ css_parser (>= 1.6.0)
htmlentities (>= 4.0.0)
- premailer-rails (1.9.7)
- actionmailer (>= 3, < 6)
+ premailer-rails (1.10.3)
+ actionmailer (>= 3)
premailer (~> 1.7, >= 1.7.9)
proc_to_ast (0.1.0)
coderay
@@ -724,7 +724,7 @@ GEM
pry (~> 0.10)
pry-rails (0.3.6)
pry (>= 0.10.4)
- public_suffix (3.1.0)
+ public_suffix (3.1.1)
puma (3.12.0)
puma_worker_killer (0.1.0)
get_process_mem (~> 0.2)
@@ -1248,7 +1248,7 @@ DEPENDENCIES
omniauth_openid_connect (~> 0.3.3)
org-ruby (~> 0.9.12)
pg (~> 1.1)
- premailer-rails (~> 1.9.7)
+ premailer-rails (~> 1.10.3)
prometheus-client-mmap (~> 0.9.10)
pry-byebug (~> 3.5.1)
pry-rails (~> 0.3.4)
--
GitLab