Commit
5121b1f200d69c735c2330a430fb672210f64dfc
Authored by
Weblate
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 remote-tracking branch 'origin/master'
| @@ -114,7 +114,9 @@ else |
| @@ -114,7 +114,9 @@ else |
114
| rails runner 'Environment.default.enable("skip_new_user_email_confirmation")' |
114
| rails runner 'Environment.default.enable("skip_new_user_email_confirmation")' |
115
| fi |
115
| fi |
116
| |
116
| |
117
| -run quiet rake noosfero:translations:compile |
117
| +if [ ! -d locale ]; then |
| |
118
| + run quiet rake noosfero:translations:compile |
| |
119
| +fi |
118
| |
120
| |
119
| # create needed directory |
121
| # create needed directory |
120
| mkdir -p tmp/pids |
122
| mkdir -p tmp/pids |