bundle update

nning · Nov 1, 2015 · 799dbd4 · 799dbd4
1 parent 9949a3d
commit 799dbd4
Showing 1 changed file with 45 additions and 38 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -30,16 +30,16 @@ GEM
       activesupport (= 3.2.22)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activerecord-jdbc-adapter (1.3.17)
+    activerecord-jdbc-adapter (1.3.18)
       activerecord (>= 2.2)
-    activerecord-jdbcmysql-adapter (1.3.17)
-      activerecord-jdbc-adapter (~> 1.3.17)
+    activerecord-jdbcmysql-adapter (1.3.18)
+      activerecord-jdbc-adapter (~> 1.3.18)
       jdbc-mysql (>= 5.1.22)
-    activerecord-jdbcpostgresql-adapter (1.3.17)
-      activerecord-jdbc-adapter (~> 1.3.17)
+    activerecord-jdbcpostgresql-adapter (1.3.18)
+      activerecord-jdbc-adapter (~> 1.3.18)
       jdbc-postgres (>= 9.1)
-    activerecord-jdbcsqlite3-adapter (1.3.17)
-      activerecord-jdbc-adapter (~> 1.3.17)
+    activerecord-jdbcsqlite3-adapter (1.3.18)
+      activerecord-jdbc-adapter (~> 1.3.18)
       jdbc-sqlite3 (>= 3.7.2, < 3.9)
     activeresource (3.2.22)
       activemodel (= 3.2.22)
@@ -58,15 +58,17 @@ GEM
       debug_inspector (>= 0.0.1)
     bootstrap-sass (3.1.1.1)
       sass (~> 3.2)
-    brakeman (3.0.5)
+    brakeman (3.1.2)
       erubis (~> 2.6)
       fastercsv (~> 1.5)
       haml (>= 3.0, < 5.0)
-      highline (~> 1.6.20)
+      highline (~> 1.6)
       multi_json (~> 1.2)
-      ruby2ruby (~> 2.1.1)
+      ruby2ruby (>= 2.1.1, < 2.3.0)
       ruby_parser (~> 3.7.0)
+      safe_yaml
       sass (~> 3.0)
+      slim (>= 1.3.6, < 4.0)
       terminal-table (~> 1.4)
     builder (3.0.4)
     cancan (1.6.10)
@@ -77,7 +79,7 @@ GEM
     capistrano-bundler (1.1.4)
       capistrano (~> 3.1)
       sshkit (~> 1.2)
-    capistrano-rails (1.1.3)
+    capistrano-rails (1.1.5)
       capistrano (~> 3.1)
       capistrano-bundler (~> 1.1)
     choice (0.2.0)
@@ -93,7 +95,7 @@ GEM
     config (1.0.0)
       activesupport (>= 3.0)
       deep_merge (~> 1.0.0)
-    coveralls (0.8.2)
+    coveralls (0.8.3)
       json (~> 1.8)
       rest-client (>= 1.6.8, < 2)
       simplecov (~> 0.10.0)
@@ -113,14 +115,14 @@ GEM
     devise-encryptable (0.2.0)
       devise (>= 2.1.0)
     docile (1.1.5)
-    domain_name (0.5.24)
+    domain_name (0.5.25)
       unf (>= 0.0.5, < 1.0.0)
-    elasticsearch (1.0.12)
-      elasticsearch-api (= 1.0.12)
-      elasticsearch-transport (= 1.0.12)
-    elasticsearch-api (1.0.12)
+    elasticsearch (1.0.14)
+      elasticsearch-api (= 1.0.14)
+      elasticsearch-transport (= 1.0.14)
+    elasticsearch-api (1.0.14)
       multi_json
-    elasticsearch-transport (1.0.12)
+    elasticsearch-transport (1.0.14)
       faraday
       multi_json
     erubis (2.7.0)
@@ -132,7 +134,7 @@ GEM
       railties (>= 3.0.0)
     faker (1.5.0)
       i18n (~> 0.5)
-    faraday (0.9.1)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     fastercsv (1.5.5)
     foreigner (1.7.4)
@@ -142,8 +144,8 @@ GEM
     has_scope (0.6.0)
       actionpack (>= 3.2, < 5)
       activesupport (>= 3.2, < 5)
-    hashie (3.4.2)
-    highline (1.6.21)
+    hashie (3.4.3)
+    highline (1.7.8)
     hike (1.2.3)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
@@ -153,37 +155,37 @@ GEM
       responders (~> 1.0.0.rc)
     jdbc-mysql (5.1.36)
     jdbc-postgres (9.4.1200)
-    jdbc-sqlite3 (3.8.10.1)
+    jdbc-sqlite3 (3.8.11.2)
     journey (1.0.4)
-    jquery-rails (3.1.3)
+    jquery-rails (3.1.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.3)
     json (1.8.3-java)
     kaminari (0.16.3)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    libv8 (3.16.14.11)
+    libv8 (3.16.14.13)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25.1)
     multi_json (1.11.2)
     multipart-post (2.0.0)
-    mysql2 (0.3.20)
+    mysql2 (0.4.1)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (2.9.2)
-    netrc (0.10.3)
+    net-ssh (3.0.1)
+    netrc (0.11.0)
     orm_adapter (0.5.0)
     paper_trail (2.7.2)
       activerecord (~> 3.0)
       railties (~> 3.0)
-    pg (0.18.2)
+    pg (0.18.3)
     polyglot (0.3.5)
-    power_assert (0.2.4)
+    power_assert (0.2.5)
     rack (1.4.7)
-    rack-cache (1.2)
+    rack-cache (1.5.1)
       rack (>= 0.4)
     rack-ssl (1.3.4)
       rack
@@ -197,7 +199,7 @@ GEM
       activesupport (= 3.2.22)
       bundler (~> 1.0)
       railties (= 3.2.22)
-    rails-erd (1.4.2)
+    rails-erd (1.4.4)
       activerecord (>= 3.2)
       activesupport (>= 3.2)
       choice (~> 0.2.0)
@@ -220,17 +222,18 @@ GEM
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
     ruby-graphviz (1.2.2)
-    ruby2ruby (2.1.4)
+    ruby2ruby (2.2.0)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.0)
-    ruby_parser (3.7.1)
+    ruby_parser (3.7.2)
       sexp_processor (~> 4.1)
-    sass (3.4.18)
+    safe_yaml (1.0.4)
+    sass (3.4.19)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    searchkick (0.9.0)
+    searchkick (1.0.0)
       activemodel
       elasticsearch (>= 1)
       hashie
@@ -249,20 +252,24 @@ GEM
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
+    slim (3.0.6)
+      temple (~> 0.7.3)
+      tilt (>= 1.3.3, < 2.1)
     sprockets (2.2.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.10)
+    sqlite3 (1.3.11)
     sshkit (1.7.1)
       colorize (>= 0.7.0)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
+    temple (0.7.6)
     term-ansicolor (1.3.2)
       tins (~> 1.0)
     terminal-table (1.5.2)
-    test-unit (3.1.3)
+    test-unit (3.1.5)
       power_assert
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
@@ -278,7 +285,7 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.44)
+    tzinfo (0.3.45)
     uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)