Merge branch 'fix-activities-test' into 'master'

commented feed code

See merge request !443

app/controllers/v1/feed_controller.rb

@@ -17,8 +17,10 @@ class V1::FeedController < ApplicationController
     query = ""
     values = [""]
 
+    # builds a query string to find all relevant activities
     current_user.watching.each do |watching|
         if !watching.respond_to?(:state) || watching.state == "published"
+          # Activities that are made by, owned by, or change the object you follow should be found
           query += " (trackable_type = ? and trackable_id = ?) or (owner_type = ? and owner_id = ?) or (recipient_type = ? and recipient_id = ?) or"
           values << watching.class.to_s
           values << watching.id
@@ -29,8 +31,8 @@ class V1::FeedController < ApplicationController
         end
     end
 
-    values[0] = query[0..-3]
-    PublicActivity::Activity.where(key: activities_filter).where(values).order(created_at: :desc)
+    values[0] = query[0..-3] # remove trailing "or" on the query
+    return PublicActivity::Activity.where(key: activities_filter).where(values).order(created_at: :desc)
   end
 
 end