aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorAkira Matsuda <ronnie@dio.jp>2017-01-29 05:36:15 +0900
committerAkira Matsuda <ronnie@dio.jp>2017-01-29 07:07:19 +0900
commit786710b0610b31234f4c44695a7689de0fb50301 (patch)
tree217d8b89b5da79feb1bfd8bb93672e9205cbb886 /Gemfile.lock
parente552db0588772d480b6a42e745931d06d60baaad (diff)
downloadrails-786710b0610b31234f4c44695a7689de0fb50301.tar.gz
rails-786710b0610b31234f4c44695a7689de0fb50301.tar.bz2
rails-786710b0610b31234f4c44695a7689de0fb50301.zip
bundle update some gems
* puma 3.7.0: to let kill("TERM") properly terminate the process in railties test (3.6.2 doesnot on my machine) * amq-protocol 2.1.0: to reduce warnings in AJ tests * rails-html-sanitizer: missing change in a previous commit that updated Gemfile
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock6
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 0ad894a269..4550d0425b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -80,7 +80,7 @@ PATH
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
- rails-html-sanitizer (~> 1.0, >= 1.0.2)
+ rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.1.0.alpha)
activesupport (= 5.1.0.alpha)
globalid (>= 0.3.6)
@@ -119,7 +119,7 @@ GEM
specs:
addressable (2.5.0)
public_suffix (~> 2.0, >= 2.0.2)
- amq-protocol (2.0.1)
+ amq-protocol (2.1.0)
ast (2.3.0)
backburner (1.3.1)
beaneater (~> 1.0)
@@ -252,7 +252,7 @@ GEM
powerpack (0.1.1)
psych (2.2.2)
public_suffix (2.0.5)
- puma (3.6.2)
+ puma (3.7.0)
qu (0.2.0)
multi_json
qu-redis (0.2.0)