aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHJ <spam@hjkos.com>2018-12-14 11:11:32 +0000
committerHJ <spam@hjkos.com>2018-12-14 11:11:32 +0000
commit54e34c68fc7797f04641b2f5fdcdb35b82bea220 (patch)
tree32ee6da0a56a79b6eec18d6754938e142db4cd39
parent99b2b7a20358a1324ea139353109784213ebd5d3 (diff)
parentc5042c07ef864e0fe1bd8728915fc2dfc191cbec (diff)
Merge branch 'placeholder_for_server_generated_meta' into 'develop'
Add placeholder to insert server generated metatags See merge request pleroma/pleroma-fe!419
-rw-r--r--build/webpack.prod.conf.js3
-rw-r--r--index.html1
2 files changed, 3 insertions, 1 deletions
diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js
index c02f8e86..9699f221 100644
--- a/build/webpack.prod.conf.js
+++ b/build/webpack.prod.conf.js
@@ -58,7 +58,8 @@ var webpackConfig = merge(baseWebpackConfig, {
minify: {
removeComments: true,
collapseWhitespace: true,
- removeAttributeQuotes: true
+ removeAttributeQuotes: true,
+ ignoreCustomComments: [/server-generated-meta/]
// more options:
// https://github.com/kangax/html-minifier#options-quick-reference
},
diff --git a/index.html b/index.html
index f0872ec9..d8defc2e 100644
--- a/index.html
+++ b/index.html
@@ -4,6 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Pleroma</title>
+ <!--server-generated-meta-->
<link rel="icon" type="image/png" href="/favicon.png">
<link rel="stylesheet" href="/static/font/css/fontello.css">
<link rel="stylesheet" href="/static/font/css/animation.css">