diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-01-28 17:54:13 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-03-19 20:04:10 +0100 |
| commit | a8aa59e96ef64a11073d7c84a9af93077f98bf8a (patch) | |
| tree | 12c521bbf5fc005a88c62cbaeeafb547c107fe9b /Gemfile.lock | |
| parent | 0ce7c1e494403cba995b77cd9dec09d79256d13d (diff) | |
| download | gitlab-ce-a8aa59e96ef64a11073d7c84a9af93077f98bf8a.tar.gz | |
Inline mailer CSS using premailer.
# Conflicts:
# Gemfile.lock
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 63ed9441c62..cc83215a2e9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -150,6 +150,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) @@ -423,6 +425,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) @@ -564,6 +567,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) @@ -992,6 +1001,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) |