Download as
Browse Code »

Commit 847ec78647b0fab9e099a1d18cacb3622d23e2ae

Authored by Weblate
2 parents 6858bef1 229c7c51
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'

Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
lib/acts_as_having_posts.rb
  Diff comments   View file @847ec78
@@ -22,7 +22,7 @@ module ActsAsHavingPosts @@ -22,7 +22,7 @@ module ActsAsHavingPosts
22 end 22 end
23 23
24 def feed 24 def feed
25 - Article.where(:parent_id => self.id).where(:type => 'RssFeed').first 25 + children.where(:type => 'RssFeed').limit(1)
26 end 26 end
27 27
28 def feed=(attrs) 28 def feed=(attrs)