From d9a9c5352aed293928fc0e5a5f4b9608cec822dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Fri, 7 Sep 2012 02:11:33 +0200
Subject: [PATCH 01/20] bump foreigner

---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 51880d3a5..c159ad2f2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -57,7 +57,7 @@ gem 'settingslogic', :git => 'https://github.com/binarylogic/settingslogic.git'
 # database
 
 gem "activerecord-import", "~> 0.2.9"
-gem 'foreigner', '~> 1.1.0'
+gem 'foreigner', '~> 1.2.1'
 gem 'mysql2', '0.3.11' 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'
diff --git a/Gemfile.lock b/Gemfile.lock
index 783f99fbe..2726d7d18 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -104,7 +104,7 @@ GEM
     bbenezech-nested_form (0.0.6)
     bcrypt-ruby (3.0.1)
     bootstrap-sass (2.0.3.1)
-    builder (3.0.0)
+    builder (3.0.1)
     capistrano (2.12.0)
       highline
       net-scp (>= 1.0.0)
@@ -188,7 +188,7 @@ GEM
       net-ssh (>= 2.1.3)
       nokogiri (~> 1.5.0)
       ruby-hmac
-    foreigner (1.1.6)
+    foreigner (1.2.1)
       activerecord (>= 3.0.0)
     foreman (0.46.0)
       thor (>= 0.13.6)
@@ -495,7 +495,7 @@ DEPENDENCIES
   fastercsv (= 1.5.5)
   fixture_builder (= 0.3.3)
   fog
-  foreigner (~> 1.1.0)
+  foreigner (~> 1.2.1)
   foreman (= 0.46)
   fuubar (>= 1.0)
   gon

From d5b4a764882f87beb44288d86e2e43e77a176a3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Fri, 7 Sep 2012 02:13:48 +0200
Subject: [PATCH 02/20] bump foreman

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index c159ad2f2..dbba0e181 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ ruby '1.9.3' if ENV['HEROKU']
 
 gem 'rails', '3.2.8'
 
-gem 'foreman', '0.46'
+gem 'foreman', '0.57'
 
 gem 'thin', '~> 1.3.1',    :require => false
 gem 'rails_autolink'
diff --git a/Gemfile.lock b/Gemfile.lock
index 2726d7d18..22229d3e0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -190,7 +190,7 @@ GEM
       ruby-hmac
     foreigner (1.2.1)
       activerecord (>= 3.0.0)
-    foreman (0.46.0)
+    foreman (0.57.0)
       thor (>= 0.13.6)
     formatador (0.2.3)
     fuubar (1.0.0)
@@ -496,7 +496,7 @@ DEPENDENCIES
   fixture_builder (= 0.3.3)
   fog
   foreigner (~> 1.2.1)
-  foreman (= 0.46)
+  foreman (= 0.57)
   fuubar (>= 1.0)
   gon
   guard-cucumber

From 72cfff77b9c684e76502832c5a9ca1920d8cef1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Fri, 7 Sep 2012 02:18:44 +0200
Subject: [PATCH 03/20] bump fixture_builder

---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index dbba0e181..9a65ec213 100644
--- a/Gemfile
+++ b/Gemfile
@@ -150,7 +150,7 @@ group :test do
 
   gem 'timecop'
   gem 'factory_girl_rails', '1.7.0'
-  gem 'fixture_builder', '0.3.3'
+  gem 'fixture_builder', '0.3.4'
   gem 'fuubar', '>= 1.0'
   gem 'rspec-instafail', '>= 0.1.7', :require => false
   gem 'selenium-webdriver', '~> 2.25'
diff --git a/Gemfile.lock b/Gemfile.lock
index 22229d3e0..e8804ce29 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -104,7 +104,7 @@ GEM
     bbenezech-nested_form (0.0.6)
     bcrypt-ruby (3.0.1)
     bootstrap-sass (2.0.3.1)
-    builder (3.0.1)
+    builder (3.0.3)
     capistrano (2.12.0)
       highline
       net-scp (>= 1.0.0)
@@ -175,7 +175,7 @@ GEM
       faraday (>= 0.7.4, < 0.9)
     fastercsv (1.5.5)
     ffi (1.1.5)
-    fixture_builder (0.3.3)
+    fixture_builder (0.3.4)
       activerecord (>= 2)
       activesupport (>= 2)
     fog (1.4.0)
@@ -493,7 +493,7 @@ DEPENDENCIES
   faraday
   faraday_middleware
   fastercsv (= 1.5.5)
-  fixture_builder (= 0.3.3)
+  fixture_builder (= 0.3.4)
   fog
   foreigner (~> 1.2.1)
   foreman (= 0.57)

From d1987d62c42103e3a38832d83f78d97edce83c85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Fri, 7 Sep 2012 02:20:05 +0200
Subject: [PATCH 04/20] bump heroku_san

---
 Gemfile      |  2 +-
 Gemfile.lock | 25 ++++++++++++-------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9a65ec213..11c8397c5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -172,7 +172,7 @@ end
 
 group :development do
   gem 'heroku'
-  gem 'heroku_san', '3.0.2', :platforms => :mri_19
+  gem 'heroku_san', '3.0.4', :platforms => :mri_19
   gem 'capistrano', :require => false
   gem 'capistrano_colors', :require => false
   gem 'capistrano-ext', :require => false
diff --git a/Gemfile.lock b/Gemfile.lock
index e8804ce29..a958a10de 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -93,7 +93,7 @@ GEM
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       rack (>= 1.1.0)
-    addressable (2.2.8)
+    addressable (2.3.2)
     airbrake (3.1.0)
       activesupport
       builder
@@ -161,7 +161,7 @@ GEM
     diff-lcs (1.1.3)
     erubis (2.7.0)
     eventmachine (0.12.10)
-    excon (0.14.2)
+    excon (0.14.3)
     execjs (1.4.0)
       multi_json (~> 1.0)
     factory_girl (2.6.4)
@@ -219,15 +219,15 @@ GEM
       sprockets (>= 2.0.3)
       tilt
     hashie (1.2.0)
-    heroku (2.26.5)
-      heroku-api (~> 0.2.4)
+    heroku (2.28.12)
+      heroku-api (~> 0.2.8)
       launchy (>= 0.3.2)
-      netrc (~> 0.7.2)
+      netrc (~> 0.7.5)
       rest-client (~> 1.6.1)
       rubyzip
-    heroku-api (0.2.4)
-      excon (~> 0.14.0)
-    heroku_san (3.0.2)
+    heroku-api (0.2.8)
+      excon (~> 0.14.3)
+    heroku_san (3.0.4)
       activesupport
       heroku (>= 2)
       heroku-api (>= 0.1.2)
@@ -259,10 +259,9 @@ GEM
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
     kgio (2.7.4)
-    launchy (2.1.0)
-      addressable (~> 2.2.6)
+    launchy (2.1.2)
+      addressable (~> 2.3)
     libwebsocket (0.1.5)
-      addressable
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
     listen (0.4.2)
@@ -290,7 +289,7 @@ GEM
     net-ssh (2.5.2)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
-    netrc (0.7.2)
+    netrc (0.7.7)
     newrelic_rpm (3.3.5)
     nokogiri (1.5.2)
     oauth (0.4.6)
@@ -505,7 +504,7 @@ DEPENDENCIES
   haml (= 3.1.6.rc.1)
   handlebars_assets
   heroku
-  heroku_san (= 3.0.2)
+  heroku_san (= 3.0.4)
   http_accept_language (~> 1.0.2)
   i18n-inflector-rails (~> 1.0)
   jasmine!

From 29967d14e1a1a63f8eef2c0c5045fcc96913bde8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Fri, 7 Sep 2012 02:24:52 +0200
Subject: [PATCH 05/20] bump omniauth

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 11c8397c5..616772799 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,7 +20,7 @@ gem 'devise', '1.5.3'
 
 gem 'remotipart', '~> 1.0'
 
-gem 'omniauth', '1.0.3'
+gem 'omniauth', '1.1.1'
 gem 'omniauth-facebook'
 gem 'omniauth-tumblr'
 gem 'omniauth-twitter'
diff --git a/Gemfile.lock b/Gemfile.lock
index a958a10de..bf20bbb98 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -300,7 +300,7 @@ GEM
     oink (0.9.3)
       activerecord
       hodel_3000_compliant_logger
-    omniauth (1.0.3)
+    omniauth (1.1.1)
       hashie (~> 1.2)
       rack
     omniauth-facebook (1.3.0)
@@ -519,7 +519,7 @@ DEPENDENCIES
   newrelic_rpm
   nokogiri (= 1.5.2)
   oink
-  omniauth (= 1.0.3)
+  omniauth (= 1.1.1)
   omniauth-facebook
   omniauth-tumblr
   omniauth-twitter

From 39a5baa8c88ecb8da21b8ff2ecd788c543a777b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Fri, 7 Sep 2012 02:28:41 +0200
Subject: [PATCH 06/20] bump resque

---
 Gemfile      |  2 +-
 Gemfile.lock | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 616772799..597e848e9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -87,7 +87,7 @@ gem 'ruby-oembed', '~> 0.8.7'
 
 # queue
 
-gem 'resque', '1.20.0'
+gem 'resque', '1.22.0'
 gem 'resque-timeout', '1.0.0'
 gem 'SystemTimer', '1.2.3', :platforms => :ruby_18
 
diff --git a/Gemfile.lock b/Gemfile.lock
index bf20bbb98..f91896242 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -368,13 +368,13 @@ GEM
     rdoc (3.12)
       json (~> 1.4)
     redcarpet (2.1.1)
-    redis (2.2.2)
-    redis-namespace (1.0.3)
-      redis (< 3.0.0)
+    redis (3.0.1)
+    redis-namespace (1.2.1)
+      redis (~> 3.0.0)
     remotipart (1.0.2)
-    resque (1.20.0)
+    resque (1.22.0)
       multi_json (~> 1.0)
-      redis-namespace (~> 1.0.2)
+      redis-namespace (~> 1.0)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
     resque-timeout (1.0.0)
@@ -418,7 +418,7 @@ GEM
       multi_json (~> 1.0)
       rubyzip
     simple_oauth (0.1.8)
-    sinatra (1.3.2)
+    sinatra (1.3.3)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
@@ -535,7 +535,7 @@ DEPENDENCIES
   rails_autolink
   redcarpet (= 2.1.1)
   remotipart (~> 1.0)
-  resque (= 1.20.0)
+  resque (= 1.22.0)
   resque-timeout (= 1.0.0)
   roxml!
   rpm_contrib (~> 2.1.7)

From 80153bf28726ce2f346c57377419a960930c5fe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Fri, 7 Sep 2012 02:30:45 +0200
Subject: [PATCH 07/20] bump thin

---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 597e848e9..cc374fa8a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,7 @@ gem 'rails', '3.2.8'
 
 gem 'foreman', '0.57'
 
-gem 'thin', '~> 1.3.1',    :require => false
+gem 'thin', '~> 1.4.1',    :require => false
 gem 'rails_autolink'
 
 # cross-origin resource sharing
diff --git a/Gemfile.lock b/Gemfile.lock
index f91896242..3066ca656 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -145,7 +145,7 @@ GEM
       capybara (>= 1.1.2)
       cucumber (>= 1.1.8)
       nokogiri (>= 1.5.0)
-    daemons (1.1.8)
+    daemons (1.1.9)
     database_cleaner (0.7.1)
     debugger (1.1.3)
       columnize (>= 0.3.1)
@@ -428,7 +428,7 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     subexec (0.2.2)
-    thin (1.3.1)
+    thin (1.4.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
@@ -547,7 +547,7 @@ DEPENDENCIES
   selenium-webdriver (~> 2.25)
   settingslogic!
   spork (~> 1.0rc2)
-  thin (~> 1.3.1)
+  thin (~> 1.4.1)
   timecop
   twitter (= 2.0.2)
   typhoeus (~> 0.3.3)

From e7b1edbef71956d6d7073df4064db8e00351df5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Fri, 7 Sep 2012 02:41:38 +0200
Subject: [PATCH 08/20] bump database_cleaner

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index cc374fa8a..e7b5d43e4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -146,7 +146,7 @@ group :test do
 
   gem 'capybara', '~> 1.1.2'
   gem 'cucumber-rails', '1.3.0', :require => false
-  gem 'database_cleaner', '0.7.1'
+  gem 'database_cleaner', '0.8'
 
   gem 'timecop'
   gem 'factory_girl_rails', '1.7.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 3066ca656..4acb65ce6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -146,7 +146,7 @@ GEM
       cucumber (>= 1.1.8)
       nokogiri (>= 1.5.0)
     daemons (1.1.9)
-    database_cleaner (0.7.1)
+    database_cleaner (0.8.0)
     debugger (1.1.3)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.1.1)
@@ -485,7 +485,7 @@ DEPENDENCIES
   carrierwave (= 0.6.2)
   client_side_validations
   cucumber-rails (= 1.3.0)
-  database_cleaner (= 0.7.1)
+  database_cleaner (= 0.8)
   debugger
   devise (= 1.5.3)
   factory_girl_rails (= 1.7.0)

From 088446e86eefea00dc01558a07bf26bcc4d0e172 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Fri, 7 Sep 2012 03:25:53 +0200
Subject: [PATCH 09/20] bump rspec-rails, remove deprecated rspec syntax

---
 Gemfile.lock                                  | 18 ++++++++---------
 spec/controllers/blocks_controller_spec.rb    |  4 ++--
 spec/controllers/likes_controller_spec.rb     |  2 +-
 spec/controllers/reshares_controller_spec.rb  |  2 +-
 .../status_messages_controller_spec.rb        |  4 ++--
 spec/helpers/notifications_helper_spec.rb     |  2 +-
 spec/integration/attack_vectors_spec.rb       | 20 +++++++++----------
 spec/lib/i18n_interpolation_fallbacks_spec.rb |  4 ++--
 spec/lib/postzord/dispatcher_spec.rb          |  2 +-
 spec/lib/salmon/slap_spec.rb                  |  2 +-
 spec/models/app_config_spec.rb                |  8 ++++----
 spec/models/photo_spec.rb                     |  6 +++---
 spec/models/reshare_spec.rb                   |  2 +-
 spec/models/status_message_spec.rb            |  2 +-
 spec/models/user_spec.rb                      |  2 +-
 15 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 4acb65ce6..5d536de1b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -384,20 +384,20 @@ GEM
     rpm_contrib (2.1.11)
       newrelic_rpm (>= 3.1.1)
       newrelic_rpm (>= 3.1.1)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
     rspec-instafail (0.2.4)
-    rspec-mocks (2.10.1)
-    rspec-rails (2.10.1)
+    rspec-mocks (2.11.2)
+    rspec-rails (2.11.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec (~> 2.10.0)
+      rspec (~> 2.11.0)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
diff --git a/spec/controllers/blocks_controller_spec.rb b/spec/controllers/blocks_controller_spec.rb
index 0fe07a91c..de1f81663 100644
--- a/spec/controllers/blocks_controller_spec.rb
+++ b/spec/controllers/blocks_controller_spec.rb
@@ -9,7 +9,7 @@ describe BlocksController do
     it "creates a block" do
       expect {
         post :create, :block => {:person_id => eve.person.id}
-      }.should change { alice.blocks.count }.by(1)
+      }.to change { alice.blocks.count }.by(1)
     end
 
     it "redirects back" do
@@ -43,7 +43,7 @@ describe BlocksController do
     it "removes a block" do
       expect {
         delete :destroy, :id => @block.id
-      }.should change { alice.blocks.count }.by(-1)
+      }.to change { alice.blocks.count }.by(-1)
     end
   end
 
diff --git a/spec/controllers/likes_controller_spec.rb b/spec/controllers/likes_controller_spec.rb
index f963e9963..dfaddc413 100644
--- a/spec/controllers/likes_controller_spec.rb
+++ b/spec/controllers/likes_controller_spec.rb
@@ -124,7 +124,7 @@ describe LikesController do
           like_count = Like.count
           expect {
             delete :destroy, :format => :json, id_field => like2.target_id, :id => like2.id
-          }.should raise_error(ActiveRecord::RecordNotFound)
+          }.to raise_error(ActiveRecord::RecordNotFound)
 
           Like.count.should == like_count
 
diff --git a/spec/controllers/reshares_controller_spec.rb b/spec/controllers/reshares_controller_spec.rb
index 9b400fa82..b9ac6b478 100644
--- a/spec/controllers/reshares_controller_spec.rb
+++ b/spec/controllers/reshares_controller_spec.rb
@@ -29,7 +29,7 @@ describe ResharesController do
       it 'creates a reshare' do
         expect{
           post_request!
-        }.should change(Reshare, :count).by(1)
+        }.to change(Reshare, :count).by(1)
       end
 
       it 'after save, calls add to streams' do
diff --git a/spec/controllers/status_messages_controller_spec.rb b/spec/controllers/status_messages_controller_spec.rb
index 2effdac35..0e7614ab3 100644
--- a/spec/controllers/status_messages_controller_spec.rb
+++ b/spec/controllers/status_messages_controller_spec.rb
@@ -226,7 +226,7 @@ describe StatusMessagesController do
       alice.save
       expect{
         @controller.remove_getting_started
-      }.should change{
+      }.to change{
         alice.reload.getting_started
       }.from(true).to(false)
     end
@@ -234,7 +234,7 @@ describe StatusMessagesController do
     it 'does nothing for returning users' do
       expect{
         @controller.remove_getting_started
-      }.should_not change{
+      }.to_not change{
         alice.reload.getting_started
       }
     end
diff --git a/spec/helpers/notifications_helper_spec.rb b/spec/helpers/notifications_helper_spec.rb
index 15804b00b..f35eda7ba 100644
--- a/spec/helpers/notifications_helper_spec.rb
+++ b/spec/helpers/notifications_helper_spec.rb
@@ -83,7 +83,7 @@ describe NotificationsHelper do
       context 'when post is deleted' do
         it 'works' do
           @post.destroy
-          expect{ object_link(@notification, notification_people_link(@notification))}.should_not raise_error
+          expect{ object_link(@notification, notification_people_link(@notification))}.to_not raise_error
         end
 
         it 'displays that the post was deleted' do
diff --git a/spec/integration/attack_vectors_spec.rb b/spec/integration/attack_vectors_spec.rb
index 110c1d500..58671cce2 100644
--- a/spec/integration/attack_vectors_spec.rb
+++ b/spec/integration/attack_vectors_spec.rb
@@ -88,7 +88,7 @@ describe "attack vectors" do
           expect_error /Contact required/ do
             zord.perform!
           end
-        }.should_not change(Post, :count)
+        }.to_not change(Post, :count)
 
         user_should_not_see_guid(bob, bad_post_guid)
       end
@@ -128,7 +128,7 @@ describe "attack vectors" do
           expect_error /Author does not match XML author/ do
             receive(profile, :from => alice, :by => bob)
           end
-        }.should_not change(eve.profile, :first_name) 
+        }.to_not change(eve.profile, :first_name) 
       end
     end
 
@@ -154,7 +154,7 @@ describe "attack vectors" do
 
         expect{
           receive(malicious_message, :from => alice, :by => bob)
-        }.should_not change(original_message, :author_id)
+        }.to_not change(original_message, :author_id)
       end
 
       it 'does not save a message over an old message with the same author' do
@@ -167,7 +167,7 @@ describe "attack vectors" do
 
         expect {
           receive(malicious_message, :from => eve, :by => bob)
-        }.should_not change(original_message, :text)
+        }.to_not change(original_message, :text)
       end
     end
 
@@ -183,7 +183,7 @@ describe "attack vectors" do
 
       expect {
         receive(ret, :from => alice, :by => bob)
-      }.should_not change(StatusMessage, :count)
+      }.to_not change(StatusMessage, :count)
     end
 
     it "silently disregards retractions for non-existent posts(that are from someone other than the post's author)" do
@@ -196,7 +196,7 @@ describe "attack vectors" do
                           end
        expect{
         receive(bogus_retraction, :from => alice, :by => bob)
-      }.should_not raise_error
+      }.to_not raise_error
     end
 
     it 'should not receive retractions where the retractor and the salmon author do not match' do
@@ -212,7 +212,7 @@ describe "attack vectors" do
         expect_error /Author does not match XML author/  do
           receive(retraction, :from => alice, :by => bob)
         end
-      }.should_not change(bob.visible_shareables(Post), :count)
+      }.to_not change(bob.visible_shareables(Post), :count)
 
     end
 
@@ -228,7 +228,7 @@ describe "attack vectors" do
 
       expect{
         receive(retraction, :from => alice, :by => bob)
-      }.should_not change{bob.reload.contacts.count}
+      }.to_not change{bob.reload.contacts.count}
     end
 
     it 'it should not allow you to send retractions with xml and salmon handle mismatch' do
@@ -242,7 +242,7 @@ describe "attack vectors" do
         expect_error /Author does not match XML author/ do
           receive(retraction, :from => alice, :by => bob)
         end
-        }.should_not change(bob.contacts, :count)
+        }.to_not change(bob.contacts, :count)
     end
 
     it 'does not let another user update other persons post' do
@@ -256,7 +256,7 @@ describe "attack vectors" do
 
       expect{
         receive(new_message, :from => alice, :by => bob)
-       }.should_not change(original_message, :text)
+       }.to_not change(original_message, :text)
     end
   end
 end
diff --git a/spec/lib/i18n_interpolation_fallbacks_spec.rb b/spec/lib/i18n_interpolation_fallbacks_spec.rb
index bb5191c1b..244512847 100644
--- a/spec/lib/i18n_interpolation_fallbacks_spec.rb
+++ b/spec/lib/i18n_interpolation_fallbacks_spec.rb
@@ -23,7 +23,7 @@ describe "i18n interpolation fallbacks" do
         I18n.t('ago').should == "%{time} ago"
       end
       it "raises a MissingInterpolationArgument when arguments are wrong" do
-        expect { I18n.t('ago', :not_time => "2 months") }.should raise_exception(I18n::MissingInterpolationArgument)
+        expect { I18n.t('ago', :not_time => "2 months") }.to raise_exception(I18n::MissingInterpolationArgument)
       end
     end
     context "current locale falls back to English" do
@@ -55,7 +55,7 @@ describe "i18n interpolation fallbacks" do
         describe "when the English translation does not work" do
           it "raises a MissingInterpolationArgument" do
             I18n.backend.store_translations('en', {"nonexistant_key" => "%{random_key} also required, so this will fail"})
-            expect { I18n.t('nonexistant_key', :hey => "what") }.should raise_exception(I18n::MissingInterpolationArgument)
+            expect { I18n.t('nonexistant_key', :hey => "what") }.to raise_exception(I18n::MissingInterpolationArgument)
           end
         end
       end
diff --git a/spec/lib/postzord/dispatcher_spec.rb b/spec/lib/postzord/dispatcher_spec.rb
index 9f70e84f9..b93f5d416 100644
--- a/spec/lib/postzord/dispatcher_spec.rb
+++ b/spec/lib/postzord/dispatcher_spec.rb
@@ -42,7 +42,7 @@ describe Postzord::Dispatcher do
     it 'raises and gives you a helpful message if the object can not federate' do
       expect {
         Postzord::Dispatcher.build(alice, [])
-      }.should raise_error /Diaspora::Federated::Base/
+      }.to raise_error /Diaspora::Federated::Base/
     end
   end
 
diff --git a/spec/lib/salmon/slap_spec.rb b/spec/lib/salmon/slap_spec.rb
index 91d854bda..8b4c2415f 100644
--- a/spec/lib/salmon/slap_spec.rb
+++ b/spec/lib/salmon/slap_spec.rb
@@ -51,7 +51,7 @@ describe Salmon::Slap do
       parsed_salmon.author_id = 'tom@tom.joindiaspora.com'
       expect {
         parsed_salmon.author.public_key
-      }.should raise_error "did you remember to async webfinger?"
+      }.to raise_error "did you remember to async webfinger?"
     end
   end
 
diff --git a/spec/models/app_config_spec.rb b/spec/models/app_config_spec.rb
index 7abe760e0..25a34d98c 100644
--- a/spec/models/app_config_spec.rb
+++ b/spec/models/app_config_spec.rb
@@ -32,7 +32,7 @@ describe AppConfig do
         it "prints an error message and exits" do
           expect {
             AppConfig.load!
-          }.should raise_error SystemExit
+          }.to raise_error SystemExit
 
           $stderr.rewind
           $stderr.string.chomp.should_not be_blank
@@ -57,7 +57,7 @@ describe AppConfig do
 
             expect {
               AppConfig.load!
-            }.should raise_error SystemExit
+            }.to raise_error SystemExit
 
             $stderr.rewind
             $stderr.string.should include("haven't set up")
@@ -69,7 +69,7 @@ describe AppConfig do
 
             expect {
               AppConfig.load!
-            }.should raise_error SystemExit
+            }.to raise_error SystemExit
 
             $stderr.rewind
             $stderr.string.should include("file format has changed")
@@ -82,7 +82,7 @@ describe AppConfig do
 
             expect {
               AppConfig.load!
-            }.should raise_error SystemExit
+            }.to raise_error SystemExit
 
             $stderr.rewind
             $stderr.string.should include("file format has changed")
diff --git a/spec/models/photo_spec.rb b/spec/models/photo_spec.rb
index 57605223a..a20616bb0 100644
--- a/spec/models/photo_spec.rb
+++ b/spec/models/photo_spec.rb
@@ -246,13 +246,13 @@ describe Photo do
     it 'is deleted with parent status message' do
       expect {
         @status_message.destroy
-      }.should change(Photo, :count).by(-1)
+      }.to change(Photo, :count).by(-1)
     end
 
     it 'will delete parent status message if message is otherwise empty' do
       expect {
         @photo2.destroy
-      }.should change(StatusMessage, :count).by(-1)
+      }.to change(StatusMessage, :count).by(-1)
     end
 
     it 'will not delete parent status message if message had other content' do
@@ -263,7 +263,7 @@ describe Photo do
       expect {
         @photo2.status_message.reload
         @photo2.destroy
-      }.should_not change(StatusMessage, :count)
+      }.to_not change(StatusMessage, :count)
     end
   end
 end
diff --git a/spec/models/reshare_spec.rb b/spec/models/reshare_spec.rb
index 3d92bc007..5234498eb 100644
--- a/spec/models/reshare_spec.rb
+++ b/spec/models/reshare_spec.rb
@@ -139,7 +139,7 @@ describe Reshare do
           
           expect{
             reshare.destroy
-          }.should_not raise_error
+          }.to_not raise_error
         end
       end
 
diff --git a/spec/models/status_message_spec.rb b/spec/models/status_message_spec.rb
index 31d7b07d3..1a1e1fbe3 100644
--- a/spec/models/status_message_spec.rb
+++ b/spec/models/status_message_spec.rb
@@ -205,7 +205,7 @@ STR
 
         expect{
           @sm.create_mentions
-        }.should_not raise_error
+        }.to_not raise_error
       end
     end
     describe '#mentioned_people' do
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index b68b927c9..08e70ba9c 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -18,7 +18,7 @@ describe User do
 
       expect{
         user.reload.encryption_key
-      }.should_not raise_error
+      }.to_not raise_error
     end
   end
 

From b8a3313a6554b241522374886f738dd4c5225e43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Fri, 7 Sep 2012 04:12:32 +0200
Subject: [PATCH 10/20] bump debugger

---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 5d536de1b..efaa0eb83 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -147,11 +147,11 @@ GEM
       nokogiri (>= 1.5.0)
     daemons (1.1.9)
     database_cleaner (0.8.0)
-    debugger (1.1.3)
+    debugger (1.2.0)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.2)
-    debugger-linecache (1.1.1)
+      debugger-ruby_core_source (~> 1.1.3)
+    debugger-linecache (1.1.2)
       debugger-ruby_core_source (>= 1.1.1)
     debugger-ruby_core_source (1.1.3)
     devise (1.5.3)

From bcbcdcee8e2d75f8c63c28253fcdf222aef2b8ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Fri, 7 Sep 2012 04:46:38 +0200
Subject: [PATCH 11/20] bump uglifier

---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index efaa0eb83..7fff00406 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -446,9 +446,9 @@ GEM
     typhoeus (0.3.3)
       mime-types
     tzinfo (0.3.33)
-    uglifier (1.2.4)
+    uglifier (1.3.0)
       execjs (>= 0.3.0)
-      multi_json (>= 1.0.2)
+      multi_json (~> 1.0, >= 1.0.2)
     unicorn (4.3.1)
       kgio (~> 2.6)
       rack

From 04a5a787ba2b8b59c8867d626282b563a133c8eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Fri, 7 Sep 2012 04:50:38 +0200
Subject: [PATCH 12/20] bump timecop

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 7fff00406..20bbe20ec 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -434,7 +434,7 @@ GEM
       rack (>= 1.0.0)
     thor (0.16.0)
     tilt (1.3.3)
-    timecop (0.3.5)
+    timecop (0.4.6)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)

From 3886547bf1285d5aef41a7944454d9e8635b7c05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Fri, 7 Sep 2012 04:53:07 +0200
Subject: [PATCH 13/20] bump rack-cors

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 20bbe20ec..7c696c55f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -322,7 +322,7 @@ GEM
     rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-cors (0.2.6)
+    rack-cors (0.2.7)
       rack
     rack-google-analytics (0.10.0)
     rack-mobile-detect (0.4.0)

From 0d925c0fed813539114c94fb9e86dbdee3033bc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Fri, 7 Sep 2012 05:10:25 +0200
Subject: [PATCH 14/20] bump haml

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index e7b5d43e4..2b4878924 100644
--- a/Gemfile
+++ b/Gemfile
@@ -103,7 +103,7 @@ gem 'typhoeus', '~> 0.3.3'
 
 # views
 
-gem 'haml', '3.1.6.rc.1'
+gem 'haml', '3.1.7'
 gem 'mobile-fu'
 
 gem 'will_paginate'
diff --git a/Gemfile.lock b/Gemfile.lock
index 7c696c55f..e24eccd04 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -213,7 +213,7 @@ GEM
     guard-spork (0.8.0)
       guard (>= 0.10.0)
       spork (>= 0.8.4)
-    haml (3.1.6.rc.1)
+    haml (3.1.7)
     handlebars_assets (0.4.4)
       execjs (>= 1.2.9)
       sprockets (>= 2.0.3)
@@ -501,7 +501,7 @@ DEPENDENCIES
   guard-cucumber
   guard-rspec
   guard-spork
-  haml (= 3.1.6.rc.1)
+  haml (= 3.1.7)
   handlebars_assets
   heroku
   heroku_san (= 3.0.4)

From ab0143d18e2c53bab7536ca90d5b7bf04f5b0507 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Fri, 7 Sep 2012 06:08:30 +0200
Subject: [PATCH 15/20] bump gon

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2b4878924..e99749291 100644
--- a/Gemfile
+++ b/Gemfile
@@ -108,7 +108,7 @@ gem 'mobile-fu'
 
 gem 'will_paginate'
 gem 'client_side_validations'
-gem 'gon'
+gem 'gon', '~> 4.0'
 
 # assets
 
diff --git a/Gemfile.lock b/Gemfile.lock
index e24eccd04..780134c5f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -199,7 +199,7 @@ GEM
       ruby-progressbar (~> 0.0.10)
     gherkin (2.11.0)
       json (>= 1.4.6)
-    gon (3.0.4)
+    gon (4.0.0)
       actionpack (>= 2.3.0)
       json
     guard (1.1.1)
@@ -497,7 +497,7 @@ DEPENDENCIES
   foreigner (~> 1.2.1)
   foreman (= 0.57)
   fuubar (>= 1.0)
-  gon
+  gon (~> 4.0)
   guard-cucumber
   guard-rspec
   guard-spork

From 108673703c604d35ac6edd6e270cd610da2b0c6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Fri, 7 Sep 2012 06:40:17 +0200
Subject: [PATCH 16/20] bump rack-google-analytics

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 780134c5f..7caf27ee1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -324,7 +324,7 @@ GEM
       rack (>= 0.4)
     rack-cors (0.2.7)
       rack
-    rack-google-analytics (0.10.0)
+    rack-google-analytics (0.11.0)
     rack-mobile-detect (0.4.0)
       rack
     rack-piwik (0.1.2)

From 9c2f864bf94c7f4b142e8b201682e951a683bcc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Fri, 7 Sep 2012 06:43:22 +0200
Subject: [PATCH 17/20] bump rack-piwik

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 7caf27ee1..f009522b3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -327,7 +327,7 @@ GEM
     rack-google-analytics (0.11.0)
     rack-mobile-detect (0.4.0)
       rack
-    rack-piwik (0.1.2)
+    rack-piwik (0.1.3)
     rack-pjax (0.5.9)
       hpricot (~> 0.8.6)
       rack (~> 1.3)

From de88463d33c93f8e6d74d5c38343d161437734bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Fri, 7 Sep 2012 06:46:28 +0200
Subject: [PATCH 18/20] bump gherkin

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index f009522b3..d006874bf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -197,7 +197,7 @@ GEM
       rspec (~> 2.0)
       rspec-instafail (~> 0.2.0)
       ruby-progressbar (~> 0.0.10)
-    gherkin (2.11.0)
+    gherkin (2.11.2)
       json (>= 1.4.6)
     gon (4.0.0)
       actionpack (>= 2.3.0)

From f22346a4aea3fd2edbfb181980058acf03405ecf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Fri, 7 Sep 2012 14:03:44 +0200
Subject: [PATCH 19/20] bump pg

---
 Gemfile      | 4 ++--
 Gemfile.lock | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index e99749291..6027fc2d2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -49,7 +49,7 @@ end
 # configuration
 
 group :heroku do
-  gem 'pg'
+  gem 'pg', '0.14.1'
   gem 'unicorn', '~> 4.3.0', :require => false
 end
 
@@ -59,7 +59,7 @@ gem 'settingslogic', :git => 'https://github.com/binarylogic/settingslogic.git'
 gem "activerecord-import", "~> 0.2.9"
 gem 'foreigner', '~> 1.2.1'
 gem 'mysql2', '0.3.11' if ENV['DB'].nil? || ENV['DB'] == 'all' || ENV['DB'] == 'mysql'
-gem 'pg' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres'
+gem 'pg', '0.14.1' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres'
 gem 'sqlite3' if ENV['DB'] == 'all' || ENV['DB'] == 'sqlite'
 
 # file uploading
diff --git a/Gemfile.lock b/Gemfile.lock
index d006874bf..aea9d58a8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -317,7 +317,7 @@ GEM
       multi_json (~> 1.3)
       omniauth-oauth (~> 1.0)
     orm_adapter (0.0.7)
-    pg (0.13.2)
+    pg (0.14.1)
     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.2)
@@ -523,7 +523,7 @@ DEPENDENCIES
   omniauth-facebook
   omniauth-tumblr
   omniauth-twitter
-  pg
+  pg (= 0.14.1)
   rack-cors (~> 0.2.4)
   rack-google-analytics
   rack-piwik

From 8dab297d26a63f96c2f6c74c32cfb3f523621f41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Mon, 10 Sep 2012 23:55:21 +0200
Subject: [PATCH 20/20] bump and convert back to gem release:
 acts-as-taggable-on

---
 Gemfile      |  2 +-
 Gemfile.lock | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index 6027fc2d2..1bf8f15af 100644
--- a/Gemfile
+++ b/Gemfile
@@ -93,7 +93,7 @@ gem 'SystemTimer', '1.2.3', :platforms => :ruby_18
 
 # tags
 
-gem 'acts-as-taggable-on', :git => "https://github.com/mbleigh/acts-as-taggable-on.git"
+gem 'acts-as-taggable-on', '2.3.3'
 
 # URIs and HTTP
 
diff --git a/Gemfile.lock b/Gemfile.lock
index aea9d58a8..3d077607a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -31,13 +31,6 @@ GIT
   specs:
     settingslogic (2.0.8)
 
-GIT
-  remote: https://github.com/mbleigh/acts-as-taggable-on.git
-  revision: d9b66b70e90352605e6f767e7c2b7a8859050655
-  specs:
-    acts-as-taggable-on (2.3.1)
-      rails (~> 3.0)
-
 GIT
   remote: https://github.com/pivotal/jasmine-gem.git
   revision: 1e075fbf5a69812fcc914c453f002ecf5bed38ab
@@ -89,6 +82,8 @@ GEM
     activesupport (3.2.8)
       i18n (~> 0.6)
       multi_json (~> 1.0)
+    acts-as-taggable-on (2.3.3)
+      rails (~> 3.0)
     acts_as_api (0.4)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -471,7 +466,7 @@ PLATFORMS
 DEPENDENCIES
   SystemTimer (= 1.2.3)
   activerecord-import (~> 0.2.9)
-  acts-as-taggable-on!
+  acts-as-taggable-on (= 2.3.3)
   acts_as_api
   addressable (~> 2.2)
   airbrake