]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Tue, 15 Dec 2020 13:27:06 +0000 (14:27 +0100)
committerClaire <claire.github-309c@sitedethib.com>
Tue, 15 Dec 2020 13:27:06 +0000 (14:27 +0100)
commite4f8679eaeea062e1f9ca9f58703b51ff8162c35
tree13940a853f1278a3c4ef89dd3a0bbedfeaaf7140
parent1978f7265e1e83bda25413da26f53c53110af764
parent8485c436d5d083c28df8c942fe521bfb46edfc9f
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/models/form/admin_settings.rb`:
  New setting added upstream. Ported it.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream removed RTL classes. Did the same.
- `config/settings.yml`:
  New setting added upstream. Ported it.
17 files changed:
Gemfile
Gemfile.lock
app/controllers/application_controller.rb
app/javascript/core/admin.js
app/javascript/styles/mastodon/components.scss
app/lib/activitypub/activity/create.rb
app/models/account.rb
app/models/form/admin_settings.rb
app/models/user.rb
app/presenters/instance_presenter.rb
app/views/about/more.html.haml
app/views/admin/reports/show.html.haml
app/views/admin/settings/edit.html.haml
app/views/statuses/_simple_status.html.haml
config/settings.yml
db/schema.rb
yarn.lock