Commit
6c93228d1815ea74ee2f188ad5753f694a1573ff
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/178' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/178
|
1
| development: |
1
| development: |
|
2
| adapter: sqlite3 |
2
| adapter: sqlite3 |
|
3
| database: db/development.db |
3
| database: db/development.db |
|
| |
4
| + timeout: 500 |
|
4
| |
5
| |
|
5
| test: &TEST |
6
| test: &TEST |
|
6
| adapter: sqlite3 |
7
| adapter: sqlite3 |
