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	Thibaut Girka <thib@sitedethib.com>
	Mon, 19 Aug 2019 17:31:32 +0000 (19:31 +0200)
committer	Thibaut Girka <thib@sitedethib.com>
	Mon, 19 Aug 2019 19:49:35 +0000 (21:49 +0200)
commit	1488be7d9683fb3442c6f7bd4fd911d224f0c929
tree	42548a596bb118e08c14c4d0ae9eacb3e8b2f36b	tree \| snapshot
parent	b859eb001717dfc62aebb8eba47b84c75aebe4ef	commit \| diff
parent	d22f3a7d5140ef1c3ae6e9bd2241bbb5289af8d1	commit \| diff

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

Conflicts:
- app/controllers/home_controller.rb
- app/controllers/shares_controller.rb
- app/javascript/packs/public.js
- app/models/status.rb
- app/serializers/initial_state_serializer.rb
- app/views/home/index.html.haml
- app/views/layouts/public.html.haml
- app/views/public_timelines/show.html.haml
- app/views/shares/show.html.haml
- app/views/tags/show.html.haml
- config/initializers/content_security_policy.rb
- config/locales/en.yml
- config/webpack/shared.js
- package.json

45 files changed:

Gemfile	diff1 \|	diff2 \|	blob \| history
Gemfile.lock	diff1 \|	diff2 \|	blob \| history
app/controllers/about_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/accounts_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/application_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/follower_accounts_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/following_accounts_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/home_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/invites_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/public_timelines_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/shares_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/tags_controller.rb	diff1 \|	diff2 \|	blob \| history
app/helpers/application_helper.rb	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/initial_state.js	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/packs/public.js	diff1 \|	diff2 \|	blob \| history
app/javascript/styles/mastodon/components.scss	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/serializers/activitypub/note_serializer.rb	diff1 \|	diff2 \|	blob \| history
app/serializers/initial_state_serializer.rb	diff1 \|	diff2 \|	blob \| history
app/views/admin/settings/edit.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/home/index.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/layouts/public.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/public_timelines/show.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/shares/show.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/tags/show.html.haml	diff1 \|	diff2 \|	blob \| history
config/environments/production.rb	diff1 \|	diff2 \|	blob \| history
config/initializers/content_security_policy.rb	diff1 \|	diff2 \|	blob \| history
config/locales/en.yml	diff1 \|	diff2 \|	blob \| history
config/locales/ja.yml	diff1 \|	diff2 \|	blob \| history
config/locales/pl.yml	diff1 \|	diff2 \|	blob \| history
config/locales/simple_form.en.yml	diff1 \|	diff2 \|	blob \| history
config/locales/simple_form.ja.yml	diff1 \|	diff2 \|	blob \| history
config/routes.rb	diff1 \|	diff2 \|	blob \| history
config/settings.yml	diff1 \|	diff2 \|	blob \| history
config/webpack/shared.js	diff1 \|	diff2 \|	blob \| history
db/schema.rb	diff1 \|	diff2 \|	blob \| history
package.json	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/about_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/accounts_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/application_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/follower_accounts_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/following_accounts_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/home_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/invites_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/public_timelines_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/shares_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/tags_controller.rb	diff1 \|	diff2 \|	blob \| history
app/helpers/application_helper.rb	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/initial_state.js	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/packs/public.js	diff1 \|	diff2 \|	blob \| history
app/javascript/styles/mastodon/components.scss	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/serializers/activitypub/note_serializer.rb	diff1 \|	diff2 \|	blob \| history
app/serializers/initial_state_serializer.rb	diff1 \|	diff2 \|	blob \| history
app/views/admin/settings/edit.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/home/index.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/layouts/public.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/public_timelines/show.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/shares/show.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/tags/show.html.haml	diff1 \|	diff2 \|	blob \| history
config/environments/production.rb	diff1 \|	diff2 \|	blob \| history
config/initializers/content_security_policy.rb	diff1 \|	diff2 \|	blob \| history
config/locales/en.yml	diff1 \|	diff2 \|	blob \| history
config/locales/ja.yml	diff1 \|	diff2 \|	blob \| history
config/locales/pl.yml	diff1 \|	diff2 \|	blob \| history
config/locales/simple_form.en.yml	diff1 \|	diff2 \|	blob \| history
config/locales/simple_form.ja.yml	diff1 \|	diff2 \|	blob \| history
config/routes.rb	diff1 \|	diff2 \|	blob \| history
config/settings.yml	diff1 \|	diff2 \|	blob \| history
config/webpack/shared.js	diff1 \|	diff2 \|	blob \| history
db/schema.rb	diff1 \|	diff2 \|	blob \| history
package.json	diff1 \|	diff2 \|	blob \| history
yarn.lock	diff1 \|	diff2 \|	blob \| history