Merge remote-tracking branch 'upstream/pull/1659'

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 29f358a6d82d595dc765f9048bd21c9a2aa18a20..046f8a462d54a5881620239251c063091ac87f15 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -43,6 +43,9 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
+    annotate (2.7.2)
+      activerecord (>= 3.2, < 6.0)
+      rake (>= 10.4, < 13.0)
     arel (7.1.4)
     ast (2.3.0)
     autoprefixer-rails (7.1.4.1)
@@ -156,12 +159,14 @@ GEM
     mime-types-data (3.2016.0521)
     mimemagic (0.3.0)
     mini_mime (0.1.4)
+    mini_portile2 (2.3.0)
     minitest (5.10.3)
     multi_json (1.12.2)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     nio4r (2.1.0)
     nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
     nokogumbo (1.4.13)
       nokogiri
     oauth (0.4.7)
@@ -349,6 +354,7 @@ PLATFORMS
 DEPENDENCIES
   SystemTimer (>= 1.1.3)
   actionpack-page_caching
+  annotate
   autoprefixer-rails
   bigdecimal (~> 1.1.0)
   canonical-rails
@@ -406,4 +412,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.13.7
+   1.15.4