Merge branch 'master' into glitch-soc/merge-upstream

Browse Source

Conflicts:
- app/controllers/admin/base_controller.rb
  Some refactoring made upstream, no real conflict.
- app/javascript/mastodon/features/compose/components/compose_form.js
  Updated using upstream's code but using maxChars instead of the
  hardcoded length of 500 characters per toot.
- app/javascript/styles/mastodon/components.scss
  Upstream redesigned the onboarding modal. Not sure why we had a
  conflict there.

...

This commit is contained in:

Thibaut Girka

2018-12-18 16:55:15 +01:00

parent 36d27e2891 5bf100f87b

commit 034ffc079e

69 changed files with 897 additions and 714 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1

app/javascript/images/screen_federation.svg Normal file

File diff suppressed because one or more lines are too long

Side by Side After Width:  |  Height:  |  Size: 37 KiB

1

app/javascript/images/screen_hello.svg Normal file

File diff suppressed because one or more lines are too long

Side by Side After Width:  |  Height:  |  Size: 8.8 KiB

1

app/javascript/images/screen_interactions.svg Normal file

File diff suppressed because one or more lines are too long

Side by Side After Width:  |  Height:  |  Size: 38 KiB