Merge branch 'master' into moderation

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index b65ec4ed9706fc79e552a0b9a4aa859931275967..d67d34d4723d4a670c57f156350b966e8e0998af 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,6 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     SystemTimer (1.2.3)
   remote: https://rubygems.org/
   specs:
     SystemTimer (1.2.3)

+    aasm (4.1.0)

     actioncable (5.1.4)
       actionpack (= 5.1.4)
       nio4r (~> 2.0)
     actioncable (5.1.4)
       actionpack (= 5.1.4)
       nio4r (~> 2.0)


@@ -162,6 +163,20 @@ GEM
     mini_mime (0.1.4)
     mini_portile2 (2.3.0)
     minitest (5.10.3)
     mini_mime (0.1.4)
     mini_portile2 (2.3.0)
     minitest (5.10.3)

+    minitest-capybara (0.8.2)
+      capybara (~> 2.2)
+      minitest (~> 5.0)
+      rake
+    minitest-metadata (0.6.0)
+      minitest (>= 4.7, < 6.0)
+    minitest-rails (3.0.0)
+      minitest (~> 5.8)
+      railties (~> 5.0)
+    minitest-rails-capybara (3.0.1)
+      capybara (~> 2.7)
+      minitest-capybara (~> 0.8)
+      minitest-metadata (~> 0.6)
+      minitest-rails (~> 3.0)

     multi_json (1.12.2)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     multi_json (1.12.2)
     multi_xml (0.6.0)
     multipart-post (2.0.0)


@@ -355,6 +370,7 @@ PLATFORMS
 
 DEPENDENCIES
   SystemTimer (>= 1.1.3)
 
 DEPENDENCIES
   SystemTimer (>= 1.1.3)

+  aasm

   actionpack-page_caching
   annotate
   autoprefixer-rails
   actionpack-page_caching
   annotate
   autoprefixer-rails


@@ -382,6 +398,7 @@ DEPENDENCIES
   listen
   logstasher
   minitest (~> 5.1)
   listen
   logstasher
   minitest (~> 5.1)

+  minitest-rails-capybara

   oauth-plugin (>= 0.5.1)
   omniauth
   omniauth-facebook
   oauth-plugin (>= 0.5.1)
   omniauth
   omniauth-facebook