updating gemfile and schema.rb
This commit is contained in:
parent
8acd9acb08
commit
9fd1d7db63
3 changed files with 3 additions and 2 deletions
|
|
@ -406,6 +406,7 @@ GEM
|
|||
linecache19 (>= 0.5.11)
|
||||
ruby-debug-base19 (>= 0.11.19)
|
||||
ruby-hmac (0.4.0)
|
||||
ruby-oembed (0.8.3)
|
||||
ruby-openid (2.1.8)
|
||||
ruby-openid-apps-discovery (1.2.0)
|
||||
ruby-openid (>= 2.1.7)
|
||||
|
|
@ -532,6 +533,7 @@ DEPENDENCIES
|
|||
rspec-rails (>= 2.0.0)
|
||||
ruby-debug
|
||||
ruby-debug19
|
||||
ruby-oembed
|
||||
sass (= 3.1.7)
|
||||
selenium-webdriver (~> 2.7.0)
|
||||
settingslogic (= 2.0.6)
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ class Post < ActiveRecord::Base
|
|||
|
||||
#scopes
|
||||
scope :all_public, where(:public => true, :pending => false)
|
||||
scope :includes_for_a_stream, includes({:author => :profile}, :mentions => {:person => :profile}) #note should include root and photos, but i think those are both on status_message
|
||||
scope :includes_for_a_stream, includes(:o_embed_cache, {:author => :profile}, :mentions => {:person => :profile}) #note should include root and photos, but i think those are both on status_message
|
||||
|
||||
def self.for_a_stream(max_time, order)
|
||||
by_max_time(max_time, order).
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ describe TagsController do
|
|||
it 'responds with json' do
|
||||
get :index, :q => "ra", :format => 'json'
|
||||
#parse json
|
||||
response.body.should include("#diaspora")
|
||||
response.body.should include("#rad")
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue