diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-01-15 22:17:48 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-01-15 22:17:48 -0600 |
| commit | 89a9d629f776a3a115c1e89ee4c13e8cbe7ae684 (patch) | |
| tree | c5da0f86e23fbd544dea6bcef124c41803c841ef /Gemfile.lock | |
| parent | 0c7dc6c78123728a9a0a32e16c2ad524e76926c8 (diff) | |
| parent | 5276c0a0900a0886b59a8ead2346540aa381ea46 (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
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 f6986cb4d..cede4aaf7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -122,6 +122,8 @@ GEM crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.3) + css_parser (1.6.0) + addressable debug_inspector (0.0.3) devise (4.3.0) bcrypt (~> 3.0) @@ -325,6 +327,13 @@ GEM pkg-config (1.2.8) posix-spawn (0.3.13) powerpack (0.1.1) + premailer (1.11.1) + addressable + css_parser (>= 1.6.0) + htmlentities (>= 4.0.0) + premailer-rails (1.10.1) + actionmailer (>= 3, < 6) + premailer (~> 1.7, >= 1.7.9) pry (0.11.3) coderay (~> 1.1.0) method_source (~> 0.9.0) @@ -602,6 +611,7 @@ DEPENDENCIES pghero (~> 1.7) pkg-config (~> 1.2) posix-spawn + premailer-rails pry-rails (~> 0.3) puma (~> 3.10) pundit (~> 1.1) |