summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-06-26 07:52:43 -0700
committerStan Hu <stanhu@gmail.com>2017-06-26 08:31:16 -0700
commite935d2ec9347b6ec65989ae78e3ffad7c26db453 (patch)
tree186fab02843561d1be916ec66cbd72915529c44b /Gemfile.lock
parent47face017562b160dba2c9bb5d7b9e75f605f721 (diff)
downloadgitlab-ce-e935d2ec9347b6ec65989ae78e3ffad7c26db453.tar.gz
Bump premailer-rails gem to 1.9.7 and its dependencies to prevent network retrieval of assets
Since asset compilation was disabled in GitLab 9.3, the premailer-rails gem would fall back to fetching assets via HTTP(s) since the Sidekiq working directory was not the Rails root. In some instances, SSL verification would fail, preventing e-mails from being sent. premailer-rails 1.9.7 has a fix (https://github.com/fphilipe/premailer-rails/pull/195) that uses an absolute directory to load assets from the filesystem so that the assets can be fetched locally instead of over the network. Closes #34231
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock11
1 files changed, 6 insertions, 5 deletions
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)