Merge branch 'stable' into develop

Changelog.md

@@ -22,6 +22,7 @@ Ruby 2.0 is no longer officially supported.
 * Drop broken install scripts [#5907](https://github.com/diaspora/diaspora/pull/5907)
 * Improve invoking mobile site in the testsuite [#5915](https://github.com/diaspora/diaspora/pull/5915)
 * Do not retry a couple of unrecoverable job failures [#5938](https://github.com/diaspora/diaspora/pull/5938) [#5942](https://github.com/diaspora/diaspora/pull/5943)
+* Remove some old temporary workarounds [#5964](https://github.com/diaspora/diaspora/pull/5964)
 
 ## Bug fixes
 * Disable auto follow back on aspect deletion [#5846](https://github.com/diaspora/diaspora/pull/5846)

app/helpers/layout_helper.rb

@@ -31,8 +31,6 @@ module LayoutHelper
   end
 
   def current_user_atom_tag
-    return #temp hax
-
     return unless @person.present?
     content_tag(:link, '', :rel => 'alternate', :href => "#{@person.public_url}.atom", :type => "application/atom+xml", :title => t('.public_feed', :name => @person.name))
   end

app/workers/notify_local_users.rb

@@ -10,10 +10,6 @@ module Workers
 
       object = object_klass.constantize.find_by_id(object_id)
 
-      #hax
-      return if (object.author.diaspora_handle == 'diasporahq@joindiaspora.com' || (object.respond_to?(:relayable?) && object.parent.author.diaspora_handle == 'diasporahq@joindiaspora.com'))
-      #end hax
-
       users = User.where(:id => user_ids)
       person = Person.find_by_id(person_id)
 

features/step_definitions/custom_web_steps.rb

@@ -103,7 +103,7 @@ end
 When /^I click to delete the first comment$/ do
   within("div.comment", match: :first) do
     find(".control-icons").hover
-    find(".comment_delete", visible: false).click # TODO: hax to check what's failing on Travis
+    find(".comment_delete").click
   end
 end
 

lib/postzord/dispatcher.rb

@@ -66,8 +66,6 @@ class Postzord::Dispatcher
     @object
   end
 
-  
-
   protected
 
   # @return [Object]
@@ -170,14 +168,7 @@ class Postzord::Dispatcher
   def notify_users(users)
     return unless users.present? && @object.respond_to?(:persisted?)
 
-    #temp hax
+    Workers::NotifyLocalUsers.perform_async(users.map(&:id), @object.class.to_s, @object.id, @object.author.id)
-    unless object_is_related_to_diaspora_hq?
-      Workers::NotifyLocalUsers.perform_async(users.map{|u| u.id}, @object.class.to_s, @object.id, @object.author.id)
-    end
-  end
-
-  def object_is_related_to_diaspora_hq?
-    (@object.author.diaspora_handle == 'diasporahq@joindiaspora.com' || (@object.respond_to?(:relayable?) && @object.parent.author.diaspora_handle == 'diasporahq@joindiaspora.com'))
   end
 end
 

spec/models/photo_spec.rb

@@ -213,7 +213,6 @@ describe Photo, :type => :model do
     end
 
     it 'should set the remote_photo on marshalling' do
-      #security hax
       user2 = FactoryGirl.create(:user)
       aspect2 = user2.aspects.create(:name => "foobars")
       connect_users(@user, @aspect, user2, aspect2)