diff options
| author | rhenium <rhenium@rhe.jp> | 2015-04-05 17:22:23 +0900 |
|---|---|---|
| committer | rhenium <rhenium@rhe.jp> | 2015-04-05 17:22:23 +0900 |
| commit | 609246084e9139b5cd7c68da22ceeba76ddb2cb0 (patch) | |
| tree | 0344b1c9d159f394f4b0a74a9be000fa931f56c2 /Gemfile.lock | |
| parent | aa94431a4a63948c149ce85f5caea1e7097bea72 (diff) | |
| parent | 6b269ecd015a8162b879813fc5fb0cda205b9488 (diff) | |
| download | aclog-609246084e9139b5cd7c68da22ceeba76ddb2cb0.tar.gz | |
Merge branch 'vuejs'
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 55130a7..86c4ed2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -155,6 +155,9 @@ GEM http_parser.rb (0.6.0) i18n (0.7.0) ice_nine (0.11.1) + jbuilder (2.2.12) + activesupport (>= 3.0.0, < 5) + multi_json (~> 1.2) jquery-rails (4.0.3) rails-dom-testing (~> 1.0) railties (>= 4.2.0) @@ -376,6 +379,7 @@ DEPENDENCIES grape-rabl guard-rspec haml-rails + jbuilder jquery-rails msgpack msgpack-rpc |