Merge branch 'master' into glitch-soc/merge-upstream
This commit is contained in:
		@@ -342,7 +342,7 @@ RSpec.describe FeedManager do
 | 
			
		||||
 | 
			
		||||
    context 'when replies policy is set to no replies' do
 | 
			
		||||
      before do
 | 
			
		||||
        list.replies_policy = :no_replies
 | 
			
		||||
        list.replies_policy = :none
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      it 'pushes statuses that are not replies' do
 | 
			
		||||
@@ -365,7 +365,7 @@ RSpec.describe FeedManager do
 | 
			
		||||
 | 
			
		||||
    context 'when replies policy is set to list-only replies' do
 | 
			
		||||
      before do
 | 
			
		||||
        list.replies_policy = :list_replies
 | 
			
		||||
        list.replies_policy = :list
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      it 'pushes statuses that are not replies' do
 | 
			
		||||
@@ -394,7 +394,7 @@ RSpec.describe FeedManager do
 | 
			
		||||
 | 
			
		||||
    context 'when replies policy is set to any reply' do
 | 
			
		||||
      before do
 | 
			
		||||
        list.replies_policy = :all_replies
 | 
			
		||||
        list.replies_policy = :followed
 | 
			
		||||
      end
 | 
			
		||||
 | 
			
		||||
      it 'pushes statuses that are not replies' do
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user