cat aescling's git repositories - mastodon.git/commit

]> cat aescling's git repositories - mastodon.git/commit

cat aescling's git repositories / mastodon.git / commit

author	Claire <claire.github-309c@sitedethib.com>
	Fri, 7 May 2021 16:21:59 +0000 (18:21 +0200)
committer	Claire <claire.github-309c@sitedethib.com>
	Fri, 7 May 2021 16:21:59 +0000 (18:21 +0200)
commit	50b430d9a2857edf8ab44e9b94c7bcb14ecd2117
tree	4932ca1d8e52f6ce9b8b9fbb304b6bfce4027e54	tree \| snapshot
parent	a346912030012dc1451249373ff7ef1a61016517	commit \| diff
parent	d8e0c8a89e1f1dd1c4ce1513deaeb3c85c6e4a42	commit \| diff

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

- `app/views/statuses/_simple_status.html.haml`:
Small markup change in glitch-soc, on a line that has been modified by
upstream. Ported upstream changes.

34 files changed:

Gemfile	diff1 \|	diff2 \|	blob \| history
Gemfile.lock	diff1 \|	diff2 \|	blob \| history
app/controllers/accounts_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/application_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/auth/confirmations_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/directories_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/statuses_controller.rb	diff1 \|	diff2 \|	blob \| history
app/helpers/application_helper.rb	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/locales/defaultMessages.json	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/locales/en.json	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/locales/ja.json	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/locales/pl.json	diff1 \|	diff2 \|	blob \| history
app/javascript/styles/mastodon/components.scss	diff1 \|	diff2 \|	blob \| history
app/lib/activitypub/activity/create.rb	diff1 \|	diff2 \|	blob \| history
app/models/account.rb	diff1 \|	diff2 \|	blob \| history
app/models/form/admin_settings.rb	diff1 \|	diff2 \|	blob \| history
app/models/media_attachment.rb	diff1 \|	diff2 \|	blob \| history
app/models/status.rb	diff1 \|	diff2 \|	blob \| history
app/models/user.rb	diff1 \|	diff2 \|	blob \| history
app/serializers/rest/account_serializer.rb	diff1 \|	diff2 \|	blob \| history
app/services/reblog_service.rb	diff1 \|	diff2 \|	blob \| history
app/views/accounts/_header.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/admin/dashboard/index.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/admin/settings/edit.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/admin/tags/index.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/media/player.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/statuses/_simple_status.html.haml	diff1 \|	diff2 \|	blob \| history
config/routes.rb	diff1 \|	diff2 \|	blob \| history
config/settings.yml	diff1 \|	diff2 \|	blob \| history
db/schema.rb	diff1 \|	diff2 \|	blob \| history
package.json	diff1 \|	diff2 \|	blob \| history
spec/models/follow_request_spec.rb	diff1 \|	diff2 \|	blob \| history
streaming/index.js	diff1 \|	diff2 \|	blob \| history
yarn.lock	diff1 \|	diff2 \|	blob \| history

source code fur Kibicat Mastodon

RSS Atom

Gemfile	diff1 \|	diff2 \|	blob \| history
Gemfile.lock	diff1 \|	diff2 \|	blob \| history
app/controllers/accounts_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/application_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/auth/confirmations_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/directories_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/statuses_controller.rb	diff1 \|	diff2 \|	blob \| history
app/helpers/application_helper.rb	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/locales/defaultMessages.json	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/locales/en.json	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/locales/ja.json	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/locales/pl.json	diff1 \|	diff2 \|	blob \| history
app/javascript/styles/mastodon/components.scss	diff1 \|	diff2 \|	blob \| history
app/lib/activitypub/activity/create.rb	diff1 \|	diff2 \|	blob \| history
app/models/account.rb	diff1 \|	diff2 \|	blob \| history
app/models/form/admin_settings.rb	diff1 \|	diff2 \|	blob \| history
app/models/media_attachment.rb	diff1 \|	diff2 \|	blob \| history
app/models/status.rb	diff1 \|	diff2 \|	blob \| history
app/models/user.rb	diff1 \|	diff2 \|	blob \| history
app/serializers/rest/account_serializer.rb	diff1 \|	diff2 \|	blob \| history
app/services/reblog_service.rb	diff1 \|	diff2 \|	blob \| history
app/views/accounts/_header.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/admin/dashboard/index.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/admin/settings/edit.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/admin/tags/index.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/media/player.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/statuses/_simple_status.html.haml	diff1 \|	diff2 \|	blob \| history
config/routes.rb	diff1 \|	diff2 \|	blob \| history
config/settings.yml	diff1 \|	diff2 \|	blob \| history
db/schema.rb	diff1 \|	diff2 \|	blob \| history
package.json	diff1 \|	diff2 \|	blob \| history
spec/models/follow_request_spec.rb	diff1 \|	diff2 \|	blob \| history
streaming/index.js	diff1 \|	diff2 \|	blob \| history
yarn.lock	diff1 \|	diff2 \|	blob \| history