Update bundle

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index fe21a3f75e0ebad372b8cb1bebc17cc869170140..76a31e169e59a8c4aacd58ef738f2de056957302 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -169,7 +169,7 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.7.0)
       mini_mime (>= 0.1.1)
       nokogiri (>= 1.5.9)
     mail (2.7.0)
       mini_mime (>= 0.1.1)

-    marcel (0.3.2)
+    marcel (0.3.3)

       mimemagic (~> 0.3.2)
     method_source (0.9.0)
     mime-types (3.2.2)
       mimemagic (~> 0.3.2)
     method_source (0.9.0)
     mime-types (3.2.2)


@@ -301,7 +301,7 @@ GEM
       rack (>= 1.4)
     rinku (2.0.4)
     rotp (3.3.1)
       rack (>= 1.4)
     rinku (2.0.4)
     rotp (3.3.1)

-    rubocop (0.58.2)
+    rubocop (0.59.1)

       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)


@@ -317,7 +317,7 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4)
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4)

-    sass (3.5.7)
+    sass (3.6.0)

       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)


@@ -358,7 +358,7 @@ GEM
     tins (1.16.3)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     tins (1.16.3)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)

-    uglifier (4.1.18)
+    uglifier (4.1.19)

       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.4.0)
     validates_email_format_of (1.6.3)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.4.0)
     validates_email_format_of (1.6.3)