vt-social/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
2018-07-16 14:50:42 +02:00
..
admin Add moderation note (#5240) 2017-10-07 20:26:43 +02:00
settings Set up /settings/keyword_mutes. #164. 2017-10-21 14:54:36 -05:00
application_helper_spec.rb Hold value of I18n.locale with ApplicationHelperSpec (#3474) 2017-05-31 17:09:28 +02:00
flashes_helper_spec.rb Spec FlashesHelper (#3414) 2017-05-29 18:03:02 +02:00
home_helper_spec.rb Fix locale related specs (#3707) 2017-06-12 10:58:03 +02:00
instance_helper_spec.rb Do not default site_title with site_hostname in InstanceHelper (#6624) 2018-03-04 20:29:49 +01:00
jsonld_helper_spec.rb Append '.test' to hostname in stub data (#7260) 2018-04-25 14:12:28 +02:00
routing_helper_spec.rb Use URI.join even when S3 enabled (#4652) 2017-08-21 12:42:16 +02:00
settings_helper_spec.rb Fix language filter codes (#4841) 2017-09-08 12:32:22 +02:00
stream_entries_helper_spec.rb Display full acct on public status pages, always (#8011) 2018-07-14 04:07:47 +02:00