Merge branch 'master' of github.com:diaspora/diaspora

.travis.yml

@@ -6,11 +6,10 @@ rvm:
 before_script:
   - "sass --update public/stylesheets/sass/:public/stylesheets/"
   - "cp config/database.yml.example config/database.yml"
-  - "rake db:drop"
   - "rake db:create"
   - "rake db:schema:load"
   - "rspec spec --tag fixture"
-
+  - 'rails runner "puts ActiveRecord::Base.connection.collation"'
 script: "bundle exec rake travis"
 env: "TRAVIS=true"
 notifications:

lib/pubsubhubbub.rb

@@ -12,7 +12,11 @@ class Pubsubhubbub
   end
 
   def publish(feed)
-    response = RestClient.post(@hub, :headers => @headers, 'hub.url' => feed, 'hub.mode' => 'publish')
+    begin
-    response
+      response = RestClient.post(@hub, :headers => @headers, 'hub.url' => feed, 'hub.mode' => 'publish')
+    return response
+    rescue  RestClient::BadRequest=> e
+      Rails.logger.warn "Public URL for your users are incorrect.  this is ok if you are in development and localhost is your pod_url#{e.inspect}" 
+    end
   end
 end