tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source 
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
This commit is contained in:
Thibaut Girka
2018-07-15 18:17:37 +02:00
parent 8e8491e1da 7a68608237
commit f26f1145ac
79 changed files with 3212 additions and 1803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spec/lib/language_detector_spec.rb
View File

@ -57,7 +57,7 @@ describe LanguageDetector do
end
it 'detects spanish language' do
string = 'Obtener un Hola y bienvenidos a Mastodon'
string = 'Obtener un Hola y bienvenidos a Mastodon. Obtener un Hola y bienvenidos a Mastodon. Obtener un Hola y bienvenidos a Mastodon. Obtener un Hola y bienvenidos a Mastodon'
result = described_class.instance.detect(string, account_without_user_locale)
expect(result).to eq :es
@ -86,7 +86,7 @@ describe LanguageDetector do
account = double(user_locale: 'fr')
result = described_class.instance.detect('', account)
expect(result).to eq :fr
expect(result).to eq nil
end
it 'uses nil when account is present but has no locale' do