You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/spec/helpers
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
8 years ago
..
admin Add moderation note (#5240) 9 years ago
settings Set up /settings/keyword_mutes. #164. 8 years ago
application_helper_spec.rb
flashes_helper_spec.rb
home_helper_spec.rb
instance_helper_spec.rb Do not default site_title with site_hostname in InstanceHelper (#6624) 8 years ago
jsonld_helper_spec.rb Append '.test' to hostname in stub data (#7260) 8 years ago
routing_helper_spec.rb
settings_helper_spec.rb
stream_entries_helper_spec.rb Display full acct on public status pages, always (#8011) 8 years ago