mastodon/app/helpers
Thibaut Girka 36393e1d2b Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/views/layouts/application.html.haml

Edited:
        app/helpers/application_helper.rb
        app/views/admin/domain_blocks/new.html.haml

Conflict wasn't really one, just two changes too close to one another.
Edition was to adapt the class names for themes to class names for
skins and flavours.

Also edited app/views/admin/domain_blocks/new.html.haml to strip the
duplicate admin pack inclusion thing.
2018-08-26 14:23:24 +02:00
..
admin Avoid deleted attributes when building a Status from action log (fixes #8371) (#8373) 2018-08-22 20:55:50 +02:00
settings Set up /settings/keyword_mutes. #164. 2017-10-21 14:54:36 -05:00
application_helper.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-08-26 14:23:24 +02:00
flashes_helper.rb Clean up flash display in views (#2336) 2017-04-23 04:22:34 +02:00
home_helper.rb Add remote interaction dialog for toots (#8202) 2018-08-18 03:03:12 +02:00
instance_helper.rb Do not default site_title with site_hostname in InstanceHelper (#6624) 2018-03-04 20:29:49 +01:00
jsonld_helper.rb Improve federated ID validation (#8372) 2018-08-22 20:55:14 +02:00
mailer_helper.rb HTML e-mails for UserMailer (#6256) 2018-01-16 03:29:11 +01:00
routing_helper.rb Fallback default thumbnail in instance status API (#6177) 2018-01-04 15:36:55 +01:00
settings_helper.rb Add Georgian language translation (#8250) 2018-08-18 01:00:01 +09:00
stream_entries_helper.rb Make unfollow button light up red when hovered (#8286) 2018-08-19 03:28:43 +02:00