diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-06-03 14:54:30 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-06-03 14:54:30 +0200 |
| commit | 76918554a6898f9b94d4ffde07face01754fd058 (patch) | |
| tree | fa394c02128610793353c0a6ba8363d814147ea4 /config | |
| parent | 35c4ff07f4d61aaf7ade2ae17060298d62b3f643 (diff) | |
| parent | f2f5c1bd6d37ec2ba7d0f98a3c0f8fead6b78f1d (diff) | |
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
Conflicts: - Gemfile.lock - config/webpack/rules/css.js - package.json - yarn.lock
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/sk.yml | 4 | ||||
| -rw-r--r-- | config/settings.yml | 2 | ||||
| -rw-r--r-- | config/webpack/rules/css.js | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/config/locales/sk.yml b/config/locales/sk.yml index e770d26ba..778a8f42f 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -49,7 +49,7 @@ sk: few: Sledovateľov one: Sledovateľ other: Sledovatelia - following: Sledovaní + following: Následujem joined: Pridal/a sa v %{date} last_active: naposledy aktívny link_verified_on: Vlastníctvo tohto odkazu bolo skontrolované %{date} @@ -214,7 +214,7 @@ sk: silence_account: "%{name} utíšil/a účet %{target}" suspend_account: "%{name} zablokoval/a účet používateľa %{target}" unassigned_report: "%{name} odobral/a report od %{target}" - unsilence_account: "%{name} zrušil/a utíšenie účtu používateľa %{target}" + unsilence_account: "%{name} zrušil/a stíšenie účtu používateľa %{target}" unsuspend_account: "%{name} zrušil/a blokovanie účtu používateľa %{target}" update_custom_emoji: "%{name} aktualizoval/a emoji %{target}" update_status: "%{name} aktualizoval/a status pre %{target}" diff --git a/config/settings.yml b/config/settings.yml index bde43cb3c..97da9883e 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -35,7 +35,7 @@ defaults: &defaults flavour: 'glitch' skin: 'default' aggregate_reblogs: true - advanced_layout: true + advanced_layout: false notification_emails: follow: false reblog: false diff --git a/config/webpack/rules/css.js b/config/webpack/rules/css.js index 9553cb55b..f9b87de9b 100644 --- a/config/webpack/rules/css.js +++ b/config/webpack/rules/css.js @@ -22,7 +22,6 @@ module.exports = { loader: 'sass-loader', options: { includePaths: ['app/javascript'], - fiber: require('fibers'), implementation: require('sass'), sourceMap: true, }, |