diff --git a/Gemfile.lock b/Gemfile.lock index 02297fe..b18fc94 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -57,13 +57,20 @@ GEM jquery-rails (3.1.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) + json (1.8.3) json (1.8.3-java) + linecache (1.3.1) mail (2.6.3) mime-types (>= 1.16, < 3) mime-types (2.6.2) minitest (5.8.1) multi_json (1.11.2) - puma (2.14.0-java) + nio4r (2.3.1) + nio4r (2.3.1-java) + puma (4.3.8) + nio4r (~> 2.0) + puma (4.3.8-java) + nio4r (~> 2.0) rack (1.5.5) rack-test (0.6.3) rack (>= 1.0) @@ -93,6 +100,8 @@ GEM ruby-debug (0.10.4) columnize (>= 0.1) ruby-debug-base (~> 0.10.4.0) + ruby-debug-base (0.10.4) + linecache (>= 0.3) ruby-debug-base (0.10.4-java) sass (3.2.19) sass-rails (4.0.5) @@ -116,6 +125,7 @@ GEM therubyrhino_jar (>= 1.7.3) therubyrhino_jar (1.7.6) thor (0.19.1) + thread_safe (0.3.5) thread_safe (0.3.5-java) tilt (1.4.1) turbolinks (2.5.3) @@ -130,6 +140,7 @@ GEM PLATFORMS java + ruby DEPENDENCIES activerecord-jdbcpostgresql-adapter