nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Jonne Haß 2015-10-14 11:00:47 +02:00
commit d9572ec337
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -89,6 +89,7 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
## Bug fixes ## Bug fixes
* Redirect to sign in page when a background request fails with 401 [#6496](https://github.com/diaspora/diaspora/pull/6496) * 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 ## Features

4
config/sidekiq.yml
View file

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