diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-04-11 02:51:05 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-04-11 02:51:05 +0000 |
| commit | 27e4dd3829ecbdc1734ba2d27258dc0c51ac6032 (patch) | |
| tree | f4747345f42780775f31114129cbc953244a9157 | |
| parent | 636b4c6dc9adf1d19ab94166a31863326f40f0ec (diff) | |
| parent | 94b48d95570cd7c0b8dbd11eb4edc957ad5c7443 (diff) | |
| download | gitlab-ce-27e4dd3829ecbdc1734ba2d27258dc0c51ac6032.tar.gz | |
Merge branch 'upgrade-premailer-rails' into 'master'
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#v192
Working towards #14286.
See merge request !3643
| -rw-r--r-- | Gemfile.lock | 6 |
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) |