diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-05-14 14:14:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-14 14:14:00 -0500 |
| commit | b5684e987484661ba63fc9815c03667a8a93586e (patch) | |
| tree | 755476fb27484fb36bd01578f8f22d4dd8d64562 /config | |
| parent | 46659655439e7d76726aa38ed5d599a795b3790f (diff) | |
| parent | ba7ee67498905cbc96d531d45a80e284880e09ee (diff) | |
Merge pull request #481 from ThibG/glitch-soc/merge
Merge upstream changes
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 1 | ||||
| -rw-r--r-- | config/locales/en.yml | 1 | ||||
| -rw-r--r-- | config/routes.rb | 2 | ||||
| -rw-r--r-- | config/webpack/configuration.js | 5 | ||||
| -rw-r--r-- | config/webpack/production.js | 4 |
5 files changed, 9 insertions, 4 deletions
diff --git a/config/application.rb b/config/application.rb index d5fcf3bd8..fca7391e8 100644 --- a/config/application.rb +++ b/config/application.rb @@ -68,6 +68,7 @@ module Mastodon :'pt-BR', :ru, :sk, + :sl, :sr, :'sr-Latn', :sv, diff --git a/config/locales/en.yml b/config/locales/en.yml index 5e0992f74..0117a9680 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -693,6 +693,7 @@ en: video: one: "%{count} video" other: "%{count} videos" + boosted_from_html: Boosted from %{acct_link} content_warning: 'Content warning: %{warning}' disallowed_hashtags: one: 'contained a disallowed hashtag: %{tags}' diff --git a/config/routes.rb b/config/routes.rb index 86aaea9ab..8fe592ee8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -326,7 +326,7 @@ Rails.application.routes.draw do end namespace :push do - resource :subscription, only: [:create, :update, :destroy] + resource :subscription, only: [:create, :show, :update, :destroy] end end diff --git a/config/webpack/configuration.js b/config/webpack/configuration.js index 47883b68d..4d0d28582 100644 --- a/config/webpack/configuration.js +++ b/config/webpack/configuration.js @@ -80,7 +80,10 @@ module.exports = { settings, core, flavours, - env, + env: { + CDN_HOST: env.CDN_HOST, + NODE_ENV: env.NODE_ENV, + }, loadersDir, output, }; diff --git a/config/webpack/production.js b/config/webpack/production.js index e1c681232..a82330791 100644 --- a/config/webpack/production.js +++ b/config/webpack/production.js @@ -6,7 +6,7 @@ const CompressionPlugin = require('compression-webpack-plugin'); const sharedConfig = require('./shared.js'); const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin; const OfflinePlugin = require('offline-plugin'); -const { publicPath } = require('./configuration.js'); +const { env, publicPath } = require('./configuration.js'); const path = require('path'); let compressionAlgorithm; @@ -90,7 +90,7 @@ module.exports = merge(sharedConfig, { '**/*.woff', ], ServiceWorker: { - entry: `imports-loader?process.env=>${encodeURIComponent(JSON.stringify(process.env))}!${encodeURI(path.join(__dirname, '../../app/javascript/mastodon/service_worker/entry.js'))}`, + entry: `imports-loader?process.env=>${encodeURIComponent(JSON.stringify(env))}!${encodeURI(path.join(__dirname, '../../app/javascript/mastodon/service_worker/entry.js'))}`, cacheName: 'mastodon', output: '../assets/sw.js', publicPath: '/sw.js', |