Commit
e713f2dd9bb1f9932ccbd2b2a2ea0341723fa9de
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 'AI3259-rss_feed_article_bug' into 'master'
Ai3259 rss feed article bug
Fixing rails 3 bug -> http://noosfero.org/Development/ActionItem3259
See merge request !289
|
1
| class RssFeed < Article |
1
| class RssFeed < Article |
|
2
| |
2
| |
|
3
| - attr_accessible :limit, :enabled, :language, :include |
3
| + attr_accessible :limit, :enabled, :language, :include, :feed_item_description |
|
4
| |
4
| |
|
5
| def self.type_name |
5
| def self.type_name |
|
6
| _('RssFeed') |
6
| _('RssFeed') |
