about summary refs log tree commit diff
path: root/app/javascript/mastodon/common.js
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2019-01-17 14:06:08 +0100
committerGitHub <noreply@github.com>2019-01-17 14:06:08 +0100
commit8b1990355974543542544e56d2046bc0c9c8716b (patch)
treee70c0682e6a9a6c7132eb97c678f97f6e943d3b1 /app/javascript/mastodon/common.js
parent30af4ee65ff43c17d6f7b1b64d6bf1d8699f37c8 (diff)
Improve the public hashtag page (#9831)
- Fix height not updating when clicking show more on public hashtag page
- Add header to the public hashtag page
- Change text size and margins on the public hashtag page
Diffstat (limited to 'app/javascript/mastodon/common.js')
-rw-r--r--app/javascript/mastodon/common.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/javascript/mastodon/common.js b/app/javascript/mastodon/common.js
index 2b10b8c30..fba21316a 100644
--- a/app/javascript/mastodon/common.js
+++ b/app/javascript/mastodon/common.js
@@ -4,5 +4,9 @@ export function start() {
   require('font-awesome/css/font-awesome.css');
   require.context('../images/', true);
 
-  Rails.start();
+  try {
+    Rails.start();
+  } catch (e) {
+    // If called twice
+  }
 };