Remove/update old "tootsuite" references, except those needed for Docker (#19327)
This commit is contained in:
		
							parent
							
								
									32c3bd3c53
								
							
						
					
					
						commit
						5f79200a5e
					
				| 
						 | 
					@ -24,7 +24,7 @@ mastodon:
 | 
				
			||||||
    removeMedia:
 | 
					    removeMedia:
 | 
				
			||||||
      enabled: true
 | 
					      enabled: true
 | 
				
			||||||
      schedule: "0 0 * * 0"
 | 
					      schedule: "0 0 * * 0"
 | 
				
			||||||
  # available locales: https://github.com/tootsuite/mastodon/blob/master/config/application.rb#L43
 | 
					  # available locales: https://github.com/mastodon/mastodon/blob/main/config/application.rb#L71
 | 
				
			||||||
  locale: en
 | 
					  locale: en
 | 
				
			||||||
  local_domain: mastodon.local
 | 
					  local_domain: mastodon.local
 | 
				
			||||||
  # Use of WEB_DOMAIN requires careful consideration: https://docs.joinmastodon.org/admin/config/#federation
 | 
					  # Use of WEB_DOMAIN requires careful consideration: https://docs.joinmastodon.org/admin/config/#federation
 | 
				
			||||||
| 
						 | 
					@ -261,7 +261,7 @@ externalAuth:
 | 
				
			||||||
    #   search: "., -"
 | 
					    #   search: "., -"
 | 
				
			||||||
    #   replace: _
 | 
					    #   replace: _
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# https://github.com/tootsuite/mastodon/blob/master/Dockerfile#L88
 | 
					# https://github.com/mastodon/mastodon/blob/main/Dockerfile#L75
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# if you manually change the UID/GID environment variables, ensure these values
 | 
					# if you manually change the UID/GID environment variables, ensure these values
 | 
				
			||||||
# match:
 | 
					# match:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -80,7 +80,7 @@ class IdsToBigints < ActiveRecord::Migration[5.1]
 | 
				
			||||||
      say 'This migration has some sections that can be safely interrupted'
 | 
					      say 'This migration has some sections that can be safely interrupted'
 | 
				
			||||||
      say 'and restarted later, and will tell you when those are occurring.'
 | 
					      say 'and restarted later, and will tell you when those are occurring.'
 | 
				
			||||||
      say ''
 | 
					      say ''
 | 
				
			||||||
      say 'For more information, see https://github.com/tootsuite/mastodon/pull/5088'
 | 
					      say 'For more information, see https://github.com/mastodon/mastodon/pull/5088'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      10.downto(1) do |i|
 | 
					      10.downto(1) do |i|
 | 
				
			||||||
        say "Continuing in #{i} second#{i == 1 ? '' : 's'}...", true
 | 
					        say "Continuing in #{i} second#{i == 1 ? '' : 's'}...", true
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue