1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-17 23:37:54 +00:00
mastodon/spec/models
Thibaut Girka f26f1145ac Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	Dockerfile
	app/javascript/packs/common.js
	config/webpack/loaders/sass.js
	config/webpack/shared.js
	db/schema.rb
	package.json
	yarn.lock

A lot of the conflicts come from updating webpack.

Even though upstream deleted app/javascript/packs/common.js, I kept
glitch-soc's version as it unifies JS/CSS packs behavior across flavours.

Ported glitch changes to webpack 4.x
2018-07-16 14:50:42 +02:00
..
admin Add logging of admin actions () 2017-11-24 02:05:53 +01:00
concerns Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
form
web Add REST API for Web Push Notifications subscriptions () 2018-05-11 11:49:12 +02:00
account_domain_block_spec.rb
account_filter_spec.rb
account_moderation_note_spec.rb Lists () 2017-11-18 00:16:48 +01:00
account_spec.rb Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
backup_spec.rb Account archive download () 2018-02-21 23:21:32 +01:00
block_spec.rb
conversation_mute_spec.rb
conversation_spec.rb
custom_emoji_spec.rb Change custom emoji search to ILIKE instead of = () 2018-04-10 15:46:27 +02:00
custom_filter_spec.rb Keyword/phrase filtering () 2018-06-29 15:34:36 +02:00
domain_block_spec.rb
email_domain_block_spec.rb Add uniqueness to block email domains () 2017-11-14 20:37:17 +01:00
export_spec.rb
favourite_spec.rb
follow_request_spec.rb Merge remote-tracking branch 'origin/master' into gs-master 2018-05-04 14:16:30 -05:00
follow_spec.rb
home_feed_spec.rb Lists () 2017-11-18 00:16:48 +01:00
identity_spec.rb CAS + SAML authentication feature () 2018-02-04 05:42:13 +01:00
import_spec.rb
invite_spec.rb Add consumable invites () 2017-11-27 16:07:59 +01:00
list_account_spec.rb Lists () 2017-11-18 00:16:48 +01:00
list_spec.rb Lists () 2017-11-18 00:16:48 +01:00
media_attachment_spec.rb Save video metadata and improve video OpenGraph tags () 2018-02-16 07:22:20 +01:00
mention_spec.rb
mute_spec.rb
notification_spec.rb Change columns in notifications nonnullable () 2018-03-24 12:51:28 +01:00
preview_card_spec.rb
relay_spec.rb Add federation relay support () 2018-07-13 02:16:06 +02:00
remote_follow_spec.rb Remove empty strings () 2017-11-17 10:52:30 +09:00
remote_profile_spec.rb Add tests for RemoteProfile () 2017-11-12 16:23:31 +09:00
report_filter_spec.rb
report_spec.rb Add missing tests for report.rb () 2018-05-03 10:42:36 +02:00
session_activation_spec.rb Add tests for SessionActivation () 2017-11-13 09:54:48 +09:00
setting_spec.rb Isolate each specs for cache store () 2018-02-17 22:35:05 +01:00
site_upload_spec.rb Add a test for SiteUpload#cache_key () 2017-11-14 20:44:11 +01:00
status_pin_spec.rb Append '.test' to hostname in stub data () 2018-04-25 14:12:28 +02:00
status_spec.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-06-21 20:49:57 +02:00
stream_entry_spec.rb Add tests for StreamEntry () 2017-11-15 02:00:58 +01:00
subscription_spec.rb
tag_spec.rb Add a test for Tag#to_param () 2017-11-15 16:04:41 +01:00
user_spec.rb Change language opt-out to language opt-in () 2018-06-17 13:54:02 +02:00