Conflicts: - `app/controllers/auth/confirmations_controller.rb`: Upstream merged our captcha code, but there are some conflicts due to glitch-soc's theming system. - `app/views/admin/settings/registrations/show.html.haml`: Upstream merged our captcha code, but there are some conflicts due to glitch-soc's theming system. Additional changes: - `Gemfile`: Upstream added hcaptcha dependency in another place in the file. - `config/settings.yml`: Upstream added the `captcha_enabled` setting in another place in the file.
		
			
				
	
	
		
			57 lines
		
	
	
		
			1.4 KiB
		
	
	
	
		
			YAML
		
	
	
	
	
	
			
		
		
	
	
			57 lines
		
	
	
		
			1.4 KiB
		
	
	
	
		
			YAML
		
	
	
	
	
	
# This file contains default values, and does not need to be edited. All
 | 
						|
# important settings can be changed from the admin interface.
 | 
						|
 | 
						|
defaults: &defaults
 | 
						|
  site_title: 'Mastodon Glitch Edition'
 | 
						|
  site_short_description: ''
 | 
						|
  site_description: ''
 | 
						|
  site_extended_description: ''
 | 
						|
  site_terms: ''
 | 
						|
  site_contact_username: ''
 | 
						|
  site_contact_email: ''
 | 
						|
  registrations_mode: 'open'
 | 
						|
  profile_directory: true
 | 
						|
  closed_registrations_message: ''
 | 
						|
  timeline_preview: false
 | 
						|
  show_staff_badge: true
 | 
						|
  preview_sensitive_media: false
 | 
						|
  noindex: false
 | 
						|
  flavour: 'glitch'
 | 
						|
  skin: 'default'
 | 
						|
  trends: true
 | 
						|
  trends_as_landing_page: true
 | 
						|
  trendable_by_default: false
 | 
						|
  trending_status_cw: true
 | 
						|
  hide_followers_count: false
 | 
						|
  reserved_usernames:
 | 
						|
    - admin
 | 
						|
    - support
 | 
						|
    - help
 | 
						|
    - root
 | 
						|
    - webmaster
 | 
						|
    - administrator
 | 
						|
    - mod
 | 
						|
    - moderator
 | 
						|
  disallowed_hashtags: # space separated string or list of hashtags without the hash
 | 
						|
  bootstrap_timeline_accounts: ''
 | 
						|
  activity_api_enabled: true
 | 
						|
  peers_api_enabled: true
 | 
						|
  show_reblogs_in_public_timelines: false
 | 
						|
  show_replies_in_public_timelines: false
 | 
						|
  default_content_type: 'text/plain'
 | 
						|
  show_domain_blocks: 'disabled'
 | 
						|
  show_domain_blocks_rationale: 'disabled'
 | 
						|
  outgoing_spoilers: ''
 | 
						|
  require_invite_text: false
 | 
						|
  backups_retention_period: 7
 | 
						|
  captcha_enabled: false
 | 
						|
 | 
						|
development:
 | 
						|
  <<: *defaults
 | 
						|
 | 
						|
test:
 | 
						|
  <<: *defaults
 | 
						|
 | 
						|
production:
 | 
						|
  <<: *defaults
 |