diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-03-21 10:46:37 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-03-21 10:46:37 +0000 |
| commit | 17de30f412b5eddaa080006b6dd2aae2bd2d5647 (patch) | |
| tree | f4866e69fb2a5a868e580bc5eb10aa8195e46449 /Gemfile.lock | |
| parent | b9fb48bc4597984710532e20f057920b0915d0c3 (diff) | |
| parent | afbcdd8e7fce5b9a530368ad3dd19292d05008f7 (diff) | |
| download | gitlab-ce-17de30f412b5eddaa080006b6dd2aae2bd2d5647.tar.gz | |
Merge branch 'backport-ee-premailer' into 'master'
Backport premailer and diff changes from EE
Backport part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151
See merge request !3318
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 3413549cb80..284964e7ec8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -148,6 +148,8 @@ GEM crack (0.4.3) safe_yaml (~> 1.0.0) creole (0.5.0) + css_parser (1.3.7) + addressable d3_rails (3.5.11) railties (>= 3.1.0) daemons (1.2.3) @@ -421,6 +423,7 @@ GEM haml (~> 4.0.0) nokogiri (~> 1.6.0) ruby_parser (~> 3.5) + htmlentities (4.3.4) http-cookie (1.0.2) domain_name (~> 0.5) http_parser.rb (0.5.3) @@ -562,6 +565,12 @@ GEM websocket-driver (>= 0.2.0) posix-spawn (0.3.11) powerpack (0.1.1) + premailer (1.8.6) + css_parser (>= 1.3.6) + htmlentities (>= 4.0.0) + premailer-rails (1.9.0) + actionmailer (>= 3, < 5) + premailer (~> 1.7, >= 1.7.9) pry (0.10.3) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -990,6 +999,7 @@ DEPENDENCIES paranoia (~> 2.0) pg (~> 0.18.2) poltergeist (~> 1.9.0) + premailer-rails (~> 1.9.0) pry-rails quiet_assets (~> 1.0.2) rack-attack (~> 4.3.1) |