mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
cd87d7dcef
- `.env.production.sample`: Our sample config file is very different from upstream since it is much more complete. Upstream added documentation for a few env variables. Copied the new variables/documentation from upstream. - `app/lib/feed_manager.rb`: Upstream added a timeline type (hashtags), while glitch-soc already had an extra one (direct messages). Not really a conflict but textually close changes. Ported upstream's changes. - `app/models/custom_emoji.rb`: Upstream upped the custom emoji size limit, while glitch-soc had configurable limits. Upped the default limits accordingly. - `streaming/index.js`: Upstream reworked how hastags were normalized. Minor conflict due to glitch-soc's handling of instance-local posts. Ported upstream's changes.
16 lines
487 B
Plaintext
16 lines
487 B
Plaintext
- content_for :page_title do
|
|
= "##{@tag.display_name}"
|
|
|
|
- content_for :header_tags do
|
|
%meta{ name: 'robots', content: 'noindex' }/
|
|
%link{ rel: 'alternate', type: 'application/rss+xml', href: tag_url(@tag, format: 'rss') }/
|
|
|
|
= render 'og'
|
|
|
|
.page-header
|
|
%h1= "##{@tag.display_name}"
|
|
%p= t('about.about_hashtag_html', hashtag: @tag.display_name)
|
|
|
|
#mastodon-timeline{ data: { props: Oj.dump(default_props.merge(hashtag: @tag.name, local: @local)) }}
|
|
.notranslate#modal-container
|