Conflicts: - `config/webpack/shared.js`: Upstream has changed how Tesseract.js gets included and dropped a dependency. The conflict is caused by glitch-soc having different code due to its theming system. Ported upstream changes. - `lib/mastodon/version.rb`: Upstream refactor/code style change in a place we replaced upstream's repo URL with ours. Ported upstram changes, keeping our repo URL. - `yarn.lock`: Upstream dropped dependencies, one of which was textually too close to a glitch-soc-specific dependency. Not a real conflict.
		
			
				
	
	
		
			60 lines
		
	
	
	
		
			1,014 B
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			60 lines
		
	
	
	
		
			1,014 B
		
	
	
	
		
			Ruby
		
	
	
	
	
	
| # frozen_string_literal: true
 | |
| 
 | |
| module Mastodon
 | |
|   module Version
 | |
|     module_function
 | |
| 
 | |
|     def major
 | |
|       3
 | |
|     end
 | |
| 
 | |
|     def minor
 | |
|       2
 | |
|     end
 | |
| 
 | |
|     def patch
 | |
|       0
 | |
|     end
 | |
| 
 | |
|     def flags
 | |
|       ''
 | |
|     end
 | |
| 
 | |
|     def suffix
 | |
|       '+glitch'
 | |
|     end
 | |
| 
 | |
|     def to_a
 | |
|       [major, minor, patch].compact
 | |
|     end
 | |
| 
 | |
|     def to_s
 | |
|       [to_a.join('.'), flags, suffix].join
 | |
|     end
 | |
| 
 | |
|     def repository
 | |
|       ENV.fetch('GITHUB_REPOSITORY', 'glitch-soc/mastodon')
 | |
|     end
 | |
| 
 | |
|     def source_base_url
 | |
|       ENV.fetch('SOURCE_BASE_URL', "https://github.com/#{repository}")
 | |
|     end
 | |
| 
 | |
|     # specify git tag or commit hash here
 | |
|     def source_tag
 | |
|       ENV.fetch('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
 |