Merge branch 'stable' into develop

Changelog.md

@@ -89,6 +89,7 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
 
 ## Bug fixes
 * Redirect to sign in page when a background request fails with 401 [#6496](https://github.com/diaspora/diaspora/pull/6496)
+* Correctly skip setting sidekiq logfile on Heroku [#6500](https://github.com/diaspora/diaspora/pull/6500)
 
 ## Features
 

config/sidekiq.yml

@@ -1,7 +1,9 @@
 <% require_relative 'config/load_config' %>
 ---
 :verbose: false
-:logfile: "<%= AppConfig.sidekiq_log unless AppConfig.heroku? %>"
+<% unless AppConfig.heroku? %>
+:logfile: "<%= AppConfig.sidekiq_log %>"
+<% end %>
 :concurrency: <%= AppConfig.environment.sidekiq.concurrency.to_i %>
 :queues:
   - socket_webfinger