Prepare Mastodon for Rails 6 (#15911)
* Fix misuse of foreign_type * Fix use of removed "add_template_helper" * Use response.media_type instead of response.content_type in tests * Fix CSV export controller test on Rails 6 Rails 6 sets a "filename*" field in the Content-Disposition header to explicitly encode the filename as UTF-8. This changes checks the first part of the Content-Disposition header so it matches in both Rails 5 and Rails 6. * Fix emoji formatting with Rails 6 * Make emoji output more idiomatic and robust * Switch from redis-rails gem to built-in Rails redis cache storage
This commit is contained in:
		@@ -158,9 +158,9 @@ class Formatter
 | 
			
		||||
          original_url, static_url = emoji
 | 
			
		||||
          replacement = begin
 | 
			
		||||
            if animate
 | 
			
		||||
              "<img draggable=\"false\" class=\"emojione\" alt=\":#{encode(shortcode)}:\" title=\":#{encode(shortcode)}:\" src=\"#{encode(original_url)}\" />"
 | 
			
		||||
              image_tag(original_url, draggable: false, class: 'emojione', alt: ":#{shortcode}:", title: ":#{shortcode}:")
 | 
			
		||||
            else
 | 
			
		||||
              "<img draggable=\"false\" class=\"emojione custom-emoji\" alt=\":#{encode(shortcode)}:\" title=\":#{encode(shortcode)}:\" src=\"#{encode(static_url)}\" data-original=\"#{original_url}\" data-static=\"#{static_url}\" />"
 | 
			
		||||
              image_tag(original_url, draggable: false, class: 'emojione custom-emoji', alt: ":#{shortcode}:", title: ":#{shortcode}:", data: { original: original_url, static: static_url })
 | 
			
		||||
            end
 | 
			
		||||
          end
 | 
			
		||||
          before_html = shortname_start_index.positive? ? html[0..shortname_start_index - 1] : ''
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user