I just pulled from jbr/master and got the following diff:
<<<<<<< HEAD:app/models/tweet.rb
# This is the method that the core view will use to
# show tweets that still need triaging.
#
# We will need to tweak the variables here for best
# user experience.
def self.need_triage
self.recent(24.hours.ago).
upvoted_less_than(5).
downvoted_less_than(5).
random.
limit(15)
=======
has_many :taggings, :dependent => :destroy
def to_s
"#{from_user}: #{text}"
>>>>>>> 06dfbaabcbc4ab64d2407ddb1a515b98f2716d08:app/models/tweet.rb
If you're planning on using Taggings instead of the need_triage method to look up Tweets, you'll have to change TweetsController to compensate. I don't see how the current version could run.
I just pulled from jbr/master and got the following diff:
If you're planning on using
Tagging
s instead of theneed_triage
method to look upTweet
s, you'll have to changeTweetsController
to compensate. I don't see how the current version could run.