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

2020-02-25 14:28:13 +01:00
parent 0d41fef506 7face973fa
commit 85933bc9ff
13 changed files with 76 additions and 61 deletions
--- a/app/javascript/mastodon/main.js
+++ b/app/javascript/mastodon/main.js
@ -12,7 +12,7 @@ function main() {
  if (window.history && history.replaceState) {
    const { pathname, search, hash } = window.location;
    const path = pathname + search + hash;
-    if (!(/^\/web[$/]/).test(path)) {
+    if (!(/^\/web($|\/)/).test(path)) {
      history.replaceState(null, document.title, `/web${path}`);
    }
  }