summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorconnorshea <connor.james.shea@gmail.com>2016-04-10 14:36:31 -0600
committerconnorshea <connor.james.shea@gmail.com>2016-04-10 14:36:31 -0600
commit94b48d95570cd7c0b8dbd11eb4edc957ad5c7443 (patch)
tree8ec67e8b43b81b71fba552c4d2f1abb57a2ba602 /Gemfile.lock
parent0631a1e9e2ad281d460b9183609e9fcef0bf4c6b (diff)
downloadgitlab-ce-94b48d95570cd7c0b8dbd11eb4edc957ad5c7443.tar.gz
Upgrade premailer-rails from 1.9.0 to 1.9.2
Includes compatibility with Rails 5. Changelog: https://github.com/fphilipe/premailer-rails/blob/master/CHANGELOG.md#v19 2 Working towards #14286.
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock6
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 28b71ac7bc8..df0d848af4c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -145,7 +145,7 @@ GEM
crack (0.4.3)
safe_yaml (~> 1.0.0)
creole (0.5.0)
- css_parser (1.3.7)
+ css_parser (1.4.1)
addressable
d3_rails (3.5.11)
railties (>= 3.1.0)
@@ -559,8 +559,8 @@ GEM
premailer (1.8.6)
css_parser (>= 1.3.6)
htmlentities (>= 4.0.0)
- premailer-rails (1.9.0)
- actionmailer (>= 3, < 5)
+ premailer-rails (1.9.2)
+ actionmailer (>= 3, < 6)
premailer (~> 1.7, >= 1.7.9)
pry (0.10.3)
coderay (~> 1.1.0)