diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-05-19 22:41:10 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-05-19 22:41:10 +0200 |
| commit | b481e4fac1c564b8008f6f1d0eea1727ec9faa08 (patch) | |
| tree | 6917de2e59e69f5ad0dc9b1471a7c7c8659c1af8 /Gemfile.lock | |
| parent | 625c4f36ef394215e65e19157bfaf60e7de94b5f (diff) | |
| parent | 6aa5ea1b5dff54941682cb006ac2b11ab7b77988 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: config/locales/simple_form.ja.yml
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 21889164e..5c1cee0a5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,4 +1,11 @@ GIT + remote: https://github.com/rtomayko/posix-spawn + revision: 58465d2e213991f8afb13b984854a49fcdcc980c + ref: 58465d2e213991f8afb13b984854a49fcdcc980c + specs: + posix-spawn (0.3.13) + +GIT remote: https://github.com/tmm1/http_parser.rb revision: 54b17ba8c7d8d20a16dfc65d1775241833219cf2 ref: 54b17ba8c7d8d20a16dfc65d1775241833219cf2 @@ -389,7 +396,6 @@ GEM pghero (2.1.0) activerecord pkg-config (1.3.0) - posix-spawn (0.3.12) powerpack (0.1.1) premailer (1.11.1) addressable @@ -714,7 +720,7 @@ DEPENDENCIES pg (~> 1.0) pghero (~> 2.1) pkg-config (~> 1.3) - posix-spawn (= 0.3.12) + posix-spawn! premailer-rails private_address_check (~> 0.4.1) pry-byebug (~> 3.6) |