treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
mastodon/spec/models
History
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
…
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 (#7445) 2018-05-11 11:49:12 +02:00
account_domain_block_spec.rb
…
account_filter_spec.rb
…
account_moderation_note_spec.rb
…
account_spec.rb Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
backup_spec.rb
…
block_spec.rb
…
conversation_mute_spec.rb
…
conversation_spec.rb
…
custom_emoji_spec.rb Change custom emoji search to `ILIKE` instead of `=` (#7099) 2018-04-10 15:46:27 +02:00
custom_filter_spec.rb Keyword/phrase filtering (#7905) 2018-06-29 15:34:36 +02:00
domain_block_spec.rb
…
email_domain_block_spec.rb
…
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
…
identity_spec.rb
…
import_spec.rb
…
invite_spec.rb
…
list_account_spec.rb
…
list_spec.rb
…
media_attachment_spec.rb
…
mention_spec.rb
…
mute_spec.rb
…
notification_spec.rb
…
preview_card_spec.rb
…
relay_spec.rb Add federation relay support (#7998) 2018-07-13 02:16:06 +02:00
remote_follow_spec.rb
…
remote_profile_spec.rb
…
report_filter_spec.rb
…
report_spec.rb Add missing tests for report.rb (#7324) 2018-05-03 10:42:36 +02:00
session_activation_spec.rb
…
setting_spec.rb
…
site_upload_spec.rb
…
status_pin_spec.rb Append '.test' to hostname in stub data (#7260) 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
…
subscription_spec.rb
…
tag_spec.rb
…
user_spec.rb Change language opt-out to language opt-in (#7823) 2018-06-17 13:54:02 +02:00