Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”.
		
			
				
	
	
		
			60 lines
		
	
	
	
		
			915 B
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			60 lines
		
	
	
	
		
			915 B
		
	
	
	
		
			Ruby
		
	
	
	
	
	
| # frozen_string_literal: true
 | |
| 
 | |
| module Mastodon
 | |
|   module Version
 | |
|     module_function
 | |
| 
 | |
|     def major
 | |
|       2
 | |
|     end
 | |
| 
 | |
|     def minor
 | |
|       4
 | |
|     end
 | |
| 
 | |
|     def patch
 | |
|       3
 | |
|     end
 | |
| 
 | |
|     def pre
 | |
|       nil
 | |
|     end
 | |
| 
 | |
|     def flags
 | |
|       ''
 | |
|     end
 | |
| 
 | |
|     def to_a
 | |
|       [major, minor, patch, pre].compact
 | |
|     end
 | |
| 
 | |
|     def to_s
 | |
|       [to_a.join('.'), flags].join
 | |
|     end
 | |
| 
 | |
|     def repository
 | |
|       'glitch-soc/mastodon'
 | |
|     end
 | |
| 
 | |
|     def source_base_url
 | |
|       "https://github.com/#{repository}"
 | |
|     end
 | |
| 
 | |
|     # specify git tag or commit hash here
 | |
|     def source_tag
 | |
|       nil
 | |
|     end
 | |
| 
 | |
|     def source_url
 | |
|       if source_tag
 | |
|         "#{source_base_url}/tree/#{source_tag}"
 | |
|       else
 | |
|         source_base_url
 | |
|       end
 | |
|     end
 | |
| 
 | |
|     def user_agent
 | |
|       @user_agent ||= "#{HTTP::Request::USER_AGENT} (Mastodon/#{Version}; +http#{Rails.configuration.x.use_https ? 's' : ''}://#{Rails.configuration.x.web_domain}/)"
 | |
|     end
 | |
|   end
 | |
| end
 |