From 58ea965d5bbb348582e7d7f71889055dbe0ea83f Mon Sep 17 00:00:00 2001
From: Nicolas Bally <nico@MacBook-Pro-de-Nicolas.local>
Date: Mon, 18 May 2015 17:00:51 +0200
Subject: [PATCH] gemfile

---
 Gemfile      |   2 +-
 Gemfile.lock | 107 ++++++++++++++++++++++++++-------------------------
 2 files changed, 56 insertions(+), 53 deletions(-)

diff --git a/Gemfile b/Gemfile
index 804ae0b..c99afe4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.0.6'
+gem 'rails', '3.0.20'
 
 # Bundle edge Rails instead:
 # gem 'rails',     :git => 'git://github.com/rails/rails.git'
diff --git a/Gemfile.lock b/Gemfile.lock
index fa06133..ad33b1f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,44 +2,38 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.6)
-      actionpack (= 3.0.6)
-      mail (~> 2.2.15)
-    actionpack (3.0.6)
-      activemodel (= 3.0.6)
-      activesupport (= 3.0.6)
+    actionmailer (3.0.20)
+      actionpack (= 3.0.20)
+      mail (~> 2.2.19)
+    actionpack (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)
-      rack (~> 1.2.1)
+      rack (~> 1.2.5)
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.6)
-      activesupport (= 3.0.6)
+    activemodel (3.0.20)
+      activesupport (= 3.0.20)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.6)
-      activemodel (= 3.0.6)
-      activesupport (= 3.0.6)
-      arel (~> 2.0.2)
+    activerecord (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
+      arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.6)
-      activemodel (= 3.0.6)
-      activesupport (= 3.0.6)
-    activesupport (3.0.6)
+    activeresource (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
+    activesupport (3.0.20)
     acts_as_list (0.1.2)
     acts_as_tree (0.1.1)
-    arel (2.0.9)
+    arel (2.0.10)
     bcrypt-ruby (2.1.4)
     builder (2.1.2)
     cancan (1.6.4)
-    capistrano (2.6.0)
-      highline
-      net-scp (>= 1.0.0)
-      net-sftp (>= 2.0.0)
-      net-ssh (>= 2.0.14)
-      net-ssh-gateway (>= 1.1.0)
     carrierwave (0.5.3)
       activesupport (~> 3.0)
     devise (1.3.4)
@@ -53,14 +47,15 @@ GEM
       activesupport (>= 2.3.7)
       i18n (~> 0.4)
     haml (3.1.1)
-    highline (1.6.1)
-    i18n (0.5.0)
+    i18n (0.5.4)
     jquery-rails (1.0.2)
       railties (~> 3.0)
       thor (~> 0.14)
+    json (1.8.2)
     kaminari (0.12.4)
       rails (>= 3.0.0)
-    mail (2.2.19)
+    kgio (2.9.3)
+    mail (2.2.20)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -74,47 +69,53 @@ GEM
       activerecord (~> 3.0.0)
       activesupport (~> 3.0.0)
       arel (~> 2.0.7)
-    mime-types (1.16)
+    mime-types (1.25.1)
     mimetype-fu (0.1.2)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-sftp (2.0.5)
-      net-ssh (>= 2.0.9)
-    net-ssh (2.1.4)
-    net-ssh-gateway (1.1.0)
-      net-ssh (>= 1.99.1)
+    mysql2 (0.2.24)
     orm_adapter (0.0.5)
-    polyglot (0.3.1)
-    rack (1.4.1)
+    polyglot (0.3.5)
+    rack (1.2.8)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.6)
-      actionmailer (= 3.0.6)
-      actionpack (= 3.0.6)
-      activerecord (= 3.0.6)
-      activeresource (= 3.0.6)
-      activesupport (= 3.0.6)
+    rails (3.0.20)
+      actionmailer (= 3.0.20)
+      actionpack (= 3.0.20)
+      activerecord (= 3.0.20)
+      activeresource (= 3.0.20)
+      activesupport (= 3.0.20)
       bundler (~> 1.0)
-      railties (= 3.0.6)
-    railties (3.0.6)
-      actionpack (= 3.0.6)
-      activesupport (= 3.0.6)
+      railties (= 3.0.20)
+    railties (3.0.20)
+      actionpack (= 3.0.20)
+      activesupport (= 3.0.20)
       rake (>= 0.8.7)
+      rdoc (~> 3.4)
       thor (~> 0.14.4)
-    rake (0.9.2.2)
+    raindrops (0.13.0)
+    rake (10.4.2)
+    rdoc (3.12.2)
+      json (~> 1.4)
     rmagick (2.13.1)
     sass (3.1.1)
     simple-navigation (3.2.0)
       activesupport (>= 2.3.2)
     sqlite3 (1.3.3)
     thor (0.14.6)
-    treetop (1.4.9)
+    treetop (1.4.15)
+      polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.27)
+    tzinfo (0.3.44)
+    unicorn (4.9.0)
+      kgio (~> 2.6)
+      rack
+      raindrops (~> 0.7)
     warden (1.0.4)
       rack (>= 1.0)
+    yaml_db (0.3.0)
+      rails (>= 3.0, < 4.3)
+      rake (>= 0.8.7)
 
 PLATFORMS
   ruby
@@ -123,7 +124,6 @@ DEPENDENCIES
   acts_as_list
   acts_as_tree
   cancan
-  capistrano
   carrierwave
   devise
   formtastic
@@ -133,8 +133,11 @@ DEPENDENCIES
   meta_search
   meta_where
   mimetype-fu
-  rails (= 3.0.6)
+  mysql2 (< 0.3)
+  rails (= 3.0.20)
   rmagick
   sass
   simple-navigation
   sqlite3
+  unicorn
+  yaml_db