Commit 5ed89114 authored by Sean McGivern's avatar Sean McGivern

Merge branch '33408-ugrade-premailer-rails' into 'master'

Upgrade premailer-rails and related dependencies

See merge request gitlab-org/gitlab!19206
parents 3d783547 c089ebc6
...@@ -296,7 +296,7 @@ gem 'rack-attack', '~> 6.2.0' ...@@ -296,7 +296,7 @@ gem 'rack-attack', '~> 6.2.0'
# Sentry integration # Sentry integration
gem 'sentry-raven', '~> 2.9' gem 'sentry-raven', '~> 2.9'
gem 'premailer-rails', '~> 1.9.7' gem 'premailer-rails', '~> 1.10.3'
# LabKit: Tracing and Correlation # LabKit: Tracing and Correlation
gem 'gitlab-labkit', '~> 0.5' gem 'gitlab-labkit', '~> 0.5'
......
...@@ -175,7 +175,7 @@ GEM ...@@ -175,7 +175,7 @@ GEM
safe_yaml (~> 1.0.0) safe_yaml (~> 1.0.0)
crass (1.0.5) crass (1.0.5)
creole (0.5.0) creole (0.5.0)
css_parser (1.5.0) css_parser (1.7.0)
addressable addressable
daemons (1.2.6) daemons (1.2.6)
danger (6.0.9) danger (6.0.9)
...@@ -584,7 +584,7 @@ GEM ...@@ -584,7 +584,7 @@ GEM
mime-types-data (3.2019.0331) mime-types-data (3.2019.0331)
mimemagic (0.3.2) mimemagic (0.3.2)
mini_magick (4.9.5) mini_magick (4.9.5)
mini_mime (1.0.1) mini_mime (1.0.2)
mini_portile2 (2.4.0) mini_portile2 (2.4.0)
minitest (5.11.3) minitest (5.11.3)
msgpack (1.3.1) msgpack (1.3.1)
...@@ -703,12 +703,12 @@ GEM ...@@ -703,12 +703,12 @@ GEM
pg (1.1.4) pg (1.1.4)
po_to_json (1.0.1) po_to_json (1.0.1)
json (>= 1.6.0) json (>= 1.6.0)
premailer (1.10.4) premailer (1.11.1)
addressable addressable
css_parser (>= 1.4.10) css_parser (>= 1.6.0)
htmlentities (>= 4.0.0) htmlentities (>= 4.0.0)
premailer-rails (1.9.7) premailer-rails (1.10.3)
actionmailer (>= 3, < 6) actionmailer (>= 3)
premailer (~> 1.7, >= 1.7.9) premailer (~> 1.7, >= 1.7.9)
proc_to_ast (0.1.0) proc_to_ast (0.1.0)
coderay coderay
...@@ -724,7 +724,7 @@ GEM ...@@ -724,7 +724,7 @@ GEM
pry (~> 0.10) pry (~> 0.10)
pry-rails (0.3.6) pry-rails (0.3.6)
pry (>= 0.10.4) pry (>= 0.10.4)
public_suffix (3.1.0) public_suffix (3.1.1)
puma (3.12.0) puma (3.12.0)
puma_worker_killer (0.1.0) puma_worker_killer (0.1.0)
get_process_mem (~> 0.2) get_process_mem (~> 0.2)
...@@ -1248,7 +1248,7 @@ DEPENDENCIES ...@@ -1248,7 +1248,7 @@ DEPENDENCIES
omniauth_openid_connect (~> 0.3.3) omniauth_openid_connect (~> 0.3.3)
org-ruby (~> 0.9.12) org-ruby (~> 0.9.12)
pg (~> 1.1) pg (~> 1.1)
premailer-rails (~> 1.9.7) premailer-rails (~> 1.10.3)
prometheus-client-mmap (~> 0.9.10) prometheus-client-mmap (~> 0.9.10)
pry-byebug (~> 3.5.1) pry-byebug (~> 3.5.1)
pry-rails (~> 0.3.4) pry-rails (~> 0.3.4)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment