]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Sun, 27 Oct 2019 11:14:01 +0000 (12:14 +0100)
committerThibaut Girka <thib@sitedethib.com>
Sun, 27 Oct 2019 11:14:01 +0000 (12:14 +0100)
commit41a98b654372532c389e720a0ecd08b9a9884b6d
treeaff32a956d3d12d67b94e3193cd3a8d6b8446b9b
parent18c07738a6b0fa3558863dbb1610695ab6f11b74
parent4988ebba4e31aff5dee657836cf059b5843d9eb8
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- README.md
- app/helpers/statuses_helper.rb
  Upstream moved account helpers to their own file, we had extra
  helpers there, moved too.
- app/lib/sanitize_config.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- config/locales/simple_form.en.yml
- spec/lib/sanitize_config_spec.rb
21 files changed:
Gemfile
Gemfile.lock
app/controllers/settings/preferences_controller.rb
app/helpers/accounts_helper.rb
app/javascript/mastodon/initial_state.js
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/styles/mastodon/components.scss
app/lib/formatter.rb
app/lib/sanitize_config.rb
app/lib/user_settings_decorator.rb
app/models/media_attachment.rb
app/models/user.rb
app/serializers/initial_state_serializer.rb
app/views/admin/tags/index.html.haml
app/views/settings/preferences/appearance/show.html.haml
app/views/statuses/_simple_status.html.haml
config/locales/en.yml
config/locales/simple_form.en.yml
config/settings.yml
package.json
yarn.lock