Commit
1f2f3e4ccbd270dd719fe124c0b060fb77c05ec8
Exists in
staging
and in
42 other branches
all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server
Merge commit 'refs/merge-requests/196' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/196
|
...
|
...
|
@@ -2,7 +2,7 @@ |
|
2
|
2
|
pid: tmp/pids/thin.pid |
|
3
|
3
|
address: 127.0.0.1 |
|
4
|
4
|
user: noosfero |
|
5
|
|
-timeout: 30 |
|
|
5
|
+timeout: 0 |
|
6
|
6
|
port: 50000 |
|
7
|
7
|
log: log/thin.log |
|
8
|
8
|
max_conns: 1024 |
...
|
...
|
|
