Conflicts:
- `app/views/admin/custom_emojis/new.html.haml`:
Upstream split some `simple_form` arguments across multiple lines.
One of the arguments in glitch-soc was different.
Split as upstream's did, keeping our different limit argument.
- `app/views/admin/settings/appearance/show.html.haml`:
Upstream split some `simple_form` arguments across multiple lines.
Glitch-soc had a different field because of the different theming
system.
Kept glitch-soc's definition of that form field.
Conflicts:
- `app/views/admin/custom_emojis/new.html.haml`:
Conflict caused by glitch-soc having a different file size limit constant
name.
Updated like upstream did while keeping glitch-soc's constant name.
* Verify link ownership with rel="me"
* Add explanation about verification to UI
* Perform link verifications
* Add click-to-copy widget for verification HTML
* Redesign edit profile page
* Redesign forms
* Improve responsive design of settings pages
* Restore landing page sign-up form
* Fix typo
* Support <link> tags, add spec
* Fix links not being verified on first discovery and passive updates
Claire
Matt Jankowski
June
Jeremy Kescher
Eugen Rochko