marrub
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
mastodon/app
History
an 7126d53baf Merge branch 'master' of https://github.com/noiob/awoospace 
# Conflicts:
#	app/controllers/settings/preferences_controller.rb
#	app/helpers/settings_helper.rb
#	app/javascript/flavours/glitch/features/compose/components/compose_form.js
#	app/javascript/flavours/glitch/features/compose/components/publisher.js
#	app/javascript/flavours/glitch/styles/about.scss
#	app/javascript/flavours/glitch/styles/variables.scss
#	app/javascript/mastodon/features/ui/components/modal_root.js
#	app/javascript/styles/mastodon/variables.scss
#	app/lib/ostatus/activity/creation.rb
#	app/models/status.rb
#	app/services/pubsubhubbub/subscribe_service.rb
#	app/services/resolve_account_service.rb
#	app/services/send_interaction_service.rb
#	app/services/update_remote_profile_service.rb
#	app/validators/status_length_validator.rb
#	app/views/about/more.html.haml
#	app/views/about/show.html.haml
#	app/workers/pubsubhubbub/delivery_worker.rb
#	config/application.rb
#	config/locales/simple_form.en.yml
 		2019-12-21 22:29:34 -05:00
..
chewy Fix needlessly indexing unsearchable statuses into ElasticSearch (#12041) 2019-10-02 20:04:46 +02:00
controllers Merge branch 'master' of https://github.com/noiob/awoospace 2019-12-21 22:29:34 -05:00
helpers Merge branch 'master' of https://github.com/noiob/awoospace 2019-12-21 22:29:34 -05:00
javascript Merge branch 'master' of https://github.com/noiob/awoospace 2019-12-21 22:29:34 -05:00
lib Merge branch 'master' of https://github.com/noiob/awoospace 2019-12-21 22:29:34 -05:00
mailers Split AccountsHelper from StatusesHelper (#12078) 2019-10-24 22:50:09 +02:00
models Merge branch 'master' of https://github.com/noiob/awoospace 2019-12-21 22:29:34 -05:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2019-08-06 13:16:53 +02:00
presenters Merge branch 'master' of https://github.com/noiob/awoospace 2019-12-21 22:29:34 -05:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2019-12-07 12:28:59 +01:00
services Merge branch 'master' of https://github.com/noiob/awoospace 2019-12-21 22:29:34 -05:00
validators Merge branch 'master' of https://github.com/noiob/awoospace 2019-12-21 22:29:34 -05:00
views Merge branch 'master' of https://github.com/noiob/awoospace 2019-12-21 22:29:34 -05:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2019-11-07 13:43:56 +01:00