diff --git a/app/activity.rb b/app/activity.rb index 1c2d97ad..e3201b8c 100644 --- a/app/activity.rb +++ b/app/activity.rb @@ -32,7 +32,7 @@ get '/activity' do query2 = query2.where(Sequel.|({events__site_id: nil}, ~{events__site_id: blocking_site_ids})).where(Sequel.|({events__actioning_site_id: nil}, ~{events__actioning_site_id: blocking_site_ids})) end - ds = query1.union(query2, all: true).order(Sequel.desc(:created_at)) + ds = query1.union(query2, all: false).order(Sequel.desc(:created_at)) else ds = Event.news_feed_default_dataset.exclude(sites__is_nsfw: true) diff --git a/views/activity.erb b/views/activity.erb index acb5a5d6..bc86ce2a 100644 --- a/views/activity.erb +++ b/views/activity.erb @@ -31,7 +31,7 @@ <% end %> - <%== erb :'_news', locals: {current_site: nil, events: @events} %> - <%== erb :'_browse_tags' %> + <%== erb :'_news', layout: false, locals: {current_site: current_site, events: @events} %> + <%== erb :'_browse_tags', layout: false %> \ No newline at end of file diff --git a/views/browse.erb b/views/browse.erb index 77b7f34b..d2cc26c7 100644 --- a/views/browse.erb +++ b/views/browse.erb @@ -143,7 +143,7 @@ <% end %> <% unless is_education? %> -<%== erb :_browse_tags %> +<%== erb :_browse_tags, layout: false %>

Text Search