]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Wed, 2 Jan 2019 12:45:18 +0000 (13:45 +0100)
committerThibaut Girka <thib@sitedethib.com>
Wed, 2 Jan 2019 14:36:53 +0000 (15:36 +0100)
commit571d219bb917cefcca7419a0ad4e3889689d5f6a
tree6ab91adcb2c164fd027708e58f5fb96c52474007
parentb300948526d967aaf5608c93546ee0d54940c0ef
parent66436d08959998be20c6c6bf631177d8c1f3e0d1
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts manually resolved:
- app/services/post_status_service.rb
- config/locales/simple_form.pl.yml
- config/routes.rb
- config/webpack/loaders/sass.js
- config/webpack/shared.js
- package.json
- yarn.lock
35 files changed:
.circleci/config.yml
.eslintrc.yml
Dockerfile
Gemfile
Gemfile.lock
Vagrantfile
app/controllers/auth/confirmations_controller.rb
app/controllers/auth/registrations_controller.rb
app/javascript/mastodon/initial_state.js
app/javascript/mastodon/locales/en.json
app/models/account.rb
app/models/user.rb
app/serializers/initial_state_serializer.rb
app/services/post_status_service.rb
app/validators/status_length_validator.rb
app/views/admin/statuses/index.html.haml
config/locales/ca.yml
config/locales/de.yml
config/locales/en.yml
config/locales/es.yml
config/locales/gl.yml
config/locales/ja.yml
config/locales/nl.yml
config/locales/oc.yml
config/locales/pl.yml
config/locales/pt-BR.yml
config/locales/simple_form.pl.yml
config/locales/sk.yml
config/routes.rb
config/webpack/loaders/sass.js
config/webpack/shared.js
db/schema.rb
package.json
spec/validators/status_length_validator_spec.rb
yarn.lock