Download as
Browse Code »

Commit 6adcfdc472a76cd0390a3dd32ca34409d76e4800

Authored by Rodrigo Souto
1 parent 3241d6a8
Exists in staging and in 32 other branches all_pending_tasks_api, api-articles-period, api_roles, comments_permissions, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_notification_email, follower_permition, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, profile_api_improvements, user_mention, webfinger_server

fix merge mistake

Showing 2 changed files with 1 additions and 14 deletions   Show diff stats
app/models/article.rb
  Diff comments   View file @6adcfdc
@@ -77,15 +77,12 @@ class Article < ActiveRecord::Base @@ -77,15 +77,12 @@ class Article < ActiveRecord::Base
77 belongs_to :last_changed_by, :class_name => 'Person', :foreign_key => 'last_changed_by_id' 77 belongs_to :last_changed_by, :class_name => 'Person', :foreign_key => 'last_changed_by_id'
78 belongs_to :created_by, :class_name => 'Person', :foreign_key => 'created_by_id' 78 belongs_to :created_by, :class_name => 'Person', :foreign_key => 'created_by_id'
79 79
80 -<<<<<<< 6fa2f904983046ed816efe293ba9dcad19a67a4b  
81 has_many :comments, :class_name => 'Comment', :as => 'source', :dependent => :destroy, :order => 'created_at asc' 80 has_many :comments, :class_name => 'Comment', :as => 'source', :dependent => :destroy, :order => 'created_at asc'
82 81
83 -=======  
84 - has_many :comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :order => 'created_at asc'  
85 has_many :article_followers, :dependent => :destroy 82 has_many :article_followers, :dependent => :destroy
86 has_many :person_followers, :class_name => 'Person', :through => :article_followers, :source => :person 83 has_many :person_followers, :class_name => 'Person', :through => :article_followers, :source => :person
87 has_many :person_followers_emails, :class_name => 'User', :through => :person_followers, :source => :user, :select => :email 84 has_many :person_followers_emails, :class_name => 'User', :through => :person_followers, :source => :user, :select => :email
88 ->>>>>>> Add feature: Article Followers 85 +
89 has_many :article_categorizations, -> { where 'articles_categories.virtual = ?', false } 86 has_many :article_categorizations, -> { where 'articles_categories.virtual = ?', false }
90 has_many :categories, :through => :article_categorizations 87 has_many :categories, :through => :article_categorizations
91 88
plugins/people_block/lib/ext/person.rb
View file @3241d6a
@@ -1,10 +0,0 @@ @@ -1,10 +0,0 @@
1 -require_dependency 'person'  
2 -  
3 -class Person  
4 -  
5 - scope :with_role, -> role_id {  
6 - joins(:role_assignments).  
7 - where("role_assignments.role_id = #{role_id}")  
8 - }  
9 -  
10 -end