]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Thu, 3 Oct 2019 09:10:12 +0000 (11:10 +0200)
committerThibaut Girka <thib@sitedethib.com>
Thu, 3 Oct 2019 09:10:12 +0000 (11:10 +0200)
commita84aedb7a7f050cbf5293351723f55a904992b3a
tree769d397390665bcddf9b44fc1ad4418b2757c5f1
parent857c67f31b23b9c496e07eda41755ba449a37f17
parentbae268b2f6501ccb0ceeb8dd36180698839c4d3c
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/models/media_attachment.rb
  Upstream raised max image size from 8MB to 10MB while our limit is
  configurable. Raised the default to 10MB.
18 files changed:
.env.production.sample
Gemfile
Gemfile.lock
app/controllers/accounts_controller.rb
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/mastodon/locales/en.json
app/javascript/mastodon/locales/ja.json
app/javascript/mastodon/locales/pl.json
app/javascript/styles/mastodon/components.scss
app/models/account.rb
app/models/media_attachment.rb
app/models/status.rb
app/presenters/instance_presenter.rb
config/locales/en.yml
config/locales/ja.yml
db/schema.rb
lib/mastodon/version.rb
yarn.lock