diff --git a/Gemfile b/Gemfile
index c9e6de7be..90d42903c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -45,7 +45,7 @@ gem 'settingslogic', :git => 'git://github.com/binarylogic/settingslogic.git'
 
 gem 'activerecord-import'
 gem 'foreigner', '~> 1.1.0'
-gem 'mysql2', '0.2.17' if ENV['DB'].nil? || ENV['DB'] == 'all' || ENV['DB'] == 'mysql'
+gem 'mysql2', '0.2.18' if ENV['DB'].nil? || ENV['DB'] == 'all' || ENV['DB'] == 'mysql'
 gem 'pg' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres'
 gem 'sqlite3' if ENV['DB'] == 'all' || ENV['DB'] == 'sqlite'
 
@@ -54,8 +54,8 @@ gem 'sqlite3' if ENV['DB'] == 'all' || ENV['DB'] == 'sqlite'
 gem 'carrierwave', '0.5.8'
 gem 'fog'
 gem 'fastercsv', '1.5.4', :require => false
-gem 'mini_magick', '3.3'
-gem 'rest-client', '1.6.1'
+gem 'mini_magick', '3.4'
+gem 'rest-client', '1.6.7'
 
 gem 'jammit', '0.6.5'
 
@@ -118,7 +118,7 @@ group :test do
   gem 'capybara', '~> 1.1.2'
   gem 'cucumber-rails', '1.2.1'
   gem 'cucumber-api-steps', '0.6', :require => false
-  gem 'database_cleaner', '0.7.0'
+  gem 'database_cleaner', '0.7.1'
   gem 'diaspora-client', :git => 'git://github.com/diaspora/diaspora-client.git'
 
   gem 'timecop'
diff --git a/Gemfile.lock b/Gemfile.lock
index ae73e84c1..181580db3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -112,7 +112,7 @@ GEM
     carrierwave (0.5.8)
       activesupport (~> 3.0)
     cgi_multipart_eof_fix (2.5.0)
-    childprocess (0.2.8)
+    childprocess (0.3.0)
       ffi (~> 1.0.6)
     chronic (0.6.6)
     client_side_validations (3.1.4)
@@ -132,7 +132,7 @@ GEM
       cucumber (>= 1.1.3)
       nokogiri (>= 1.5.0)
     daemons (1.1.5)
-    database_cleaner (0.7.0)
+    database_cleaner (0.7.1)
     devise (1.3.4)
       bcrypt-ruby (~> 2.1.2)
       orm_adapter (~> 0.0.3)
@@ -147,10 +147,10 @@ GEM
       abstract (>= 1.0.0)
     eventmachine (0.12.10)
     excon (0.9.4)
-    factory_girl (2.3.2)
+    factory_girl (2.4.0)
       activesupport
-    factory_girl_rails (1.4.0)
-      factory_girl (~> 2.3.0)
+    factory_girl_rails (1.5.0)
+      factory_girl (~> 2.4.0)
       railties (>= 3.0.0)
     faraday (0.7.0)
       addressable (~> 2.2.4)
@@ -185,7 +185,7 @@ GEM
       rspec-instafail (~> 0.1.8)
       ruby-progressbar (~> 0.0.10)
     gem_plugin (0.2.3)
-    gherkin (2.7.2)
+    gherkin (2.7.3)
       json (>= 1.4.6)
     haml (3.1.4)
     hashie (1.2.0)
@@ -213,7 +213,7 @@ GEM
       rspec (>= 1.3.1)
       selenium-webdriver (>= 0.1.3)
     jasmine-core (1.1.0)
-    json (1.6.4)
+    json (1.6.5)
     jsonpath (0.4.2)
       multi_json
     jwt (0.1.4)
@@ -230,8 +230,8 @@ GEM
       treetop (~> 1.4.8)
     messagebus_ruby_api (1.0.1)
     mime-types (1.17.2)
-    mini_magick (3.3)
-      subexec (~> 0.1.0)
+    mini_magick (3.4)
+      subexec (~> 0.2.1)
     mobile-fu (0.3.0)
       rack-mobile-detect
       rails
@@ -243,12 +243,12 @@ GEM
       gem_plugin (>= 0.2.3)
     multi_json (1.0.4)
     multipart-post (1.1.4)
-    mysql2 (0.2.17)
+    mysql2 (0.2.18)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
       net-ssh (>= 2.0.9)
-    net-ssh (2.2.2)
+    net-ssh (2.3.0)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
     newrelic_rpm (3.3.1)
@@ -278,7 +278,7 @@ GEM
     open4 (1.3.0)
     orm_adapter (0.0.6)
     parallel (0.5.11)
-    parallel_tests (0.6.14)
+    parallel_tests (0.6.16)
       parallel
     pg (0.12.2)
     polyglot (0.3.3)
@@ -325,7 +325,7 @@ GEM
       resque (>= 1.10.0)
     resque-timeout (1.0.0)
       resque (~> 1.0)
-    rest-client (1.6.1)
+    rest-client (1.6.7)
       mime-types (>= 1.16)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
@@ -371,7 +371,7 @@ GEM
       rack (~> 1.1)
       tilt (>= 1.2.2, < 2.0)
     sqlite3 (1.3.5)
-    subexec (0.1.0)
+    subexec (0.2.1)
     term-ansicolor (1.0.7)
     thin (1.3.1)
       daemons (>= 1.0.9)
@@ -426,7 +426,7 @@ DEPENDENCIES
   client_side_validations
   cucumber-api-steps (= 0.6)
   cucumber-rails (= 1.2.1)
-  database_cleaner (= 0.7.0)
+  database_cleaner (= 0.7.1)
   devise (~> 1.3.1)
   devise_invitable (= 0.5.0)
   diaspora-client!
@@ -451,11 +451,11 @@ DEPENDENCIES
   jwt
   linecache (= 0.46)
   messagebus_ruby_api (= 1.0.1)
-  mini_magick (= 3.3)
+  mini_magick (= 3.4)
   mobile-fu
   mock_redis
   mongrel
-  mysql2 (= 0.2.17)
+  mysql2 (= 0.2.18)
   newrelic_rpm
   nokogiri (~> 1.5.0)
   oauth2-provider (= 0.0.19)
@@ -473,7 +473,7 @@ DEPENDENCIES
   resque (= 1.19.0)
   resque-ensure-connected
   resque-timeout (= 1.0.0)
-  rest-client (= 1.6.1)
+  rest-client (= 1.6.7)
   roxml!
   rspec (>= 2.0.0)
   rspec-core (~> 2.8.0)