Commit
93a94df506fad037af2247a0ee5b762522845646
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 branch 'ai3016' into 'stable'
Don't show p tag on ProfileImageBlock? if there is no title
http://noosfero.org/Development/ActionItem3016
|
1
| <div class="vcard"> |
1
| <div class="vcard"> |
|
2
| |
2
| |
|
3
| -<p><%= block.title %></p> |
3
| +<% if block.title.present? %> |
|
| |
4
| + <p><%= block.title %></p> |
|
| |
5
| +<% end %> |
|
4
| |
6
| |
|
5
| <div class="profile-big-image"> |
7
| <div class="profile-big-image"> |
|
6
| <div class="profile-big-image-inner1"> |
8
| <div class="profile-big-image-inner1"> |
