remove escapes from server-side ɣaml handler

this matches a change that was made in the client-side equivalent

Remove some leftover code

Merge upstream

The version of Redis that ships with Ubuntu Trusty is too old to support
the HyperLogLog commands.  I guess we could add a custom apt repo for
this, but it seems a lot easier to just use the latest Ubuntu LTS
release (i.e. xenial), which has a recent-enough Redis in its archives.

* adding armenian translations

* updating config files for armenian translations

* armenian translation fix

* fixing spaces

Conflicts:
	app/controllers/settings/two_factor_authentication/confirmations_controller.rb

Since 872a0d5bd801c998d911f7da582a60d2f714a710, assets URL are absolute and
not relative. Unfortunately, the domain used to build such URLs is the wrong
one: LOCAL_DOMAIN, and not WEB_DOMAIN, where the assets are stored.

if notifications column is not mounted, also display number of
unread notifications there.

Display a warning when composing unlisted toots with something looking like a hashtag

Merge upstream

* Change mailer avatar url

* Use full_asset_url method

Conflicts:
	app/javascript/styles/mastodon/components.scss

* i18n: (zh-CN) Add translations of #6251

* i18n: (zh-CN) Improve translations for #6291

* Fix en.json

* i18n: (zh-CN) Update translations for #6303

* i18n: (zh-CN) Add translations of #6273
with minor adjustment

* Minor fix

* Minor fix

* Restore onboarding modal
Revert 5ba8b3a396

* Change greeting elephant graphic, fix up some design issues

* Fix wrong link color in onboarding modal

* Use PNG images in HTML e-mails

* Make webpack use URLs with host so fonts load inside HTML e-mails

Convert this back to a relative URL in the premailer CSS loader
since local requests are quicker

* Improve responsive design

* Add missing PNG icon

* Make text e-mails consistent with HTML ones in UserMailer

* Fix UserMailer specs

Conflicts:
	app/javascript/styles/mastodon/components.scss
	app/javascript/styles/mastodon/modal.scss

Do not discard statuses obtained via websocket when API request finishes

This backports 0b888acfd4

This may lead to out-of-order notifications, but this is better than not having
notifications at all.

when starting the container.

Currently, Mastodon will retry delivering toots for a bit over 1 hour.
This is a very short timespan when considering private and direct toots, which
cannot be seen by the recipient at all after the delivery attempts have failed.

Ideally, private and direct toots should have a different number of retries,
but I do not know how to do that.

* Replace drawer elephant graphic with a vector image

* Replace wave graphic with SVG

* Remove unused elephant graphic

This is a backport of b6af88192f to the glitch flavour.

Merge in home feed regeneration changes from upstream

Update win95 theme from cybrespace/mastodon

* Fix regeneration key not getting expired

* Add rake task to remove old regeneration markers

* Remove onboarding modal

* Welcome e-mail

* Send welcome e-mail after confirmation

* Remove obsolete translations

Conflicts:
	app/javascript/styles/win95.scss
	config/themes.yml

This allows these component styles to be used in i.e. the win95 skin.