updated gems

mokevnin · Aug 26, 2011 · bb8d788 · bb8d788
1 parent 5ca95b0
commit bb8d788
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 41 deletions.
diff --git a/Gemfile b/Gemfile
@@ -10,7 +10,7 @@ gem 'omniauth'
 gem 'simple_form'
 gem 'ancestry'
 gem 'state_machine'
-gem 'hoptoad_notifier'
+gem "airbrake", "~> 3.0.rc2"
 gem 'haml'
 gem 'kaminari'
 gem 'thinking-sphinx'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -30,7 +30,10 @@ GEM
     activesupport (3.0.10)
     acts-as-taggable-on (2.1.1)
       rails
-    addressable (2.2.4)
+    addressable (2.2.6)
+    airbrake (3.0.rc2)
+      activesupport
+      builder
     ancestry (1.2.4)
       activerecord (>= 2.2.2)
     arel (2.0.10)
@@ -69,9 +72,6 @@ GEM
     gem_plugin (0.2.3)
     haml (3.1.2)
     highline (1.6.2)
-    hoptoad_notifier (2.4.11)
-      activesupport
-      builder
     i18n (0.5.0)
     jquery-rails (1.0.13)
       railties (~> 3.0)
@@ -89,10 +89,9 @@ GEM
       daemons (>= 1.0.3)
       fastthread (>= 1.0.1)
       gem_plugin (>= 0.2.3)
-    multi_json (1.0.3)
-    multi_xml (0.2.2)
+    multi_json (0.0.5)
     multipart-post (1.1.3)
-    net-ldap (0.2.2)
+    net-ldap (0.1.1)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
@@ -101,51 +100,53 @@ GEM
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
     nokogiri (1.4.7)
-    oa-basic (0.2.6)
-      oa-core (= 0.2.6)
+    oa-basic (0.2.3)
+      multi_json (~> 0.0.2)
+      nokogiri (~> 1.4.2)
+      oa-core (= 0.2.3)
       rest-client (~> 1.6.0)
-    oa-core (0.2.6)
-    oa-enterprise (0.2.6)
-      addressable (= 2.2.4)
-      net-ldap (~> 0.2.2)
+    oa-core (0.2.3)
+      rack (~> 1.1)
+    oa-enterprise (0.2.3)
+      net-ldap (~> 0.1.1)
       nokogiri (~> 1.4.2)
-      oa-core (= 0.2.6)
+      oa-core (= 0.2.3)
       pyu-ruby-sasl (~> 0.0.3.1)
       rubyntlm (~> 0.1.1)
-    oa-more (0.2.6)
-      multi_json (~> 1.0.0)
-      oa-core (= 0.2.6)
+    oa-more (0.2.3)
+      multi_json (~> 0.0.2)
+      oa-core (= 0.2.3)
       rest-client (~> 1.6.0)
-    oa-oauth (0.2.6)
+    oa-oauth (0.2.3)
       faraday (~> 0.6.1)
-      multi_json (~> 1.0.0)
-      multi_xml (~> 0.2.2)
-      oa-core (= 0.2.6)
+      multi_json (>= 0.0.5)
+      nokogiri (~> 1.4.2)
+      oa-core (= 0.2.3)
       oauth (~> 0.4.0)
-      oauth2 (~> 0.4.1)
-    oa-openid (0.2.6)
-      oa-core (= 0.2.6)
-      rack-openid (~> 1.3.1)
-      ruby-openid-apps-discovery (~> 1.2.0)
+      oauth2 (~> 0.3.0)
+    oa-openid (0.2.3)
+      oa-core (= 0.2.3)
+      rack-openid (~> 1.2.0)
+      ruby-openid-apps-discovery
     oauth (0.4.5)
-    oauth2 (0.4.1)
-      faraday (~> 0.6.1)
-      multi_json (>= 0.0.5)
-    omniauth (0.2.6)
-      oa-basic (= 0.2.6)
-      oa-core (= 0.2.6)
-      oa-enterprise (= 0.2.6)
-      oa-more (= 0.2.6)
-      oa-oauth (= 0.2.6)
-      oa-openid (= 0.2.6)
+    oauth2 (0.3.0)
+      faraday (~> 0.6.0)
+      multi_json (~> 0.0.4)
+    omniauth (0.2.3)
+      oa-basic (= 0.2.3)
+      oa-core (= 0.2.3)
+      oa-enterprise (= 0.2.3)
+      oa-more (= 0.2.3)
+      oa-oauth (= 0.2.3)
+      oa-openid (= 0.2.3)
     orm_adapter (0.0.5)
     pg (0.11.0)
     polyglot (0.3.2)
     pyu-ruby-sasl (0.0.3.3)
     rack (1.2.3)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
-    rack-openid (1.3.1)
+    rack-openid (1.2.0)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
     rack-test (0.5.7)
@@ -202,8 +203,8 @@ GEM
     tzinfo (0.3.29)
     warden (1.0.5)
       rack (>= 1.0)
-    webmock (1.6.2)
-      addressable (>= 2.2.2)
+    webmock (1.7.4)
+      addressable (~> 2.2, > 2.2.5)
       crack (>= 0.1.7)
     yamler (0.1.0)
     yard (0.7.2)
@@ -213,6 +214,7 @@ PLATFORMS
 
 DEPENDENCIES
   acts-as-taggable-on
+  airbrake (~> 3.0.rc2)
   ancestry
   capistrano
   capistrano-ext
@@ -221,7 +223,6 @@ DEPENDENCIES
   devise
   factory_girl_rails
   haml
-  hoptoad_notifier
   jquery-rails
   kaminari
   mongrel