bark/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity

Compare commits

base: bark:fb94cd866ab00f88e05c4b500fee4fd1bafaea51
Branches Tags
bark:main
bark:bark-prod
...
compare: bark:f39c791bbdbb994b70baf20d9cf822f1ecf187cf
Branches Tags
bark:bark-prod
bark:main

3 commits
fb94cd866a ... f39c791bbd

Author SHA1 Message Date
Dalite Fur
f39c791bbd s3 retries 2023-11-09 21:55:34 +01:00
Dalite Fur
bb10a911b5 update check cron 2023-11-09 21:54:16 +01:00
Dalite Fur
d126d231c7 footer 2023-11-09 21:53:50 +01:00
3 changed files with 14 additions and 9 deletions
Show stats Expand all files Collapse all files

19
app/javascript/mastodon/features/ui/components/link_footer.jsx
View file

@ -90,14 +90,19 @@ class LinkFooter extends PureComponent {
</p>
<p>
<strong>Mastodon</strong>:
<strong>Bark services</strong>:
{' '}
<a href='https://joinmastodon.org' target='_blank'><FormattedMessage id='footer.about' defaultMessage='About' /></a>
{DividingCircle}
<a href='https://joinmastodon.org/apps' target='_blank'><FormattedMessage id='footer.get_app' defaultMessage='Get the app' /></a>
{DividingCircle}
<Link to='/keyboard-shortcuts'><FormattedMessage id='footer.keyboard_shortcuts' defaultMessage='Keyboard shortcuts' /></Link>
{DividingCircle}
{statusPageUrl && (
<>
{DividingCircle}
<a href={statusPageUrl} target='_blank' rel='noopener'><FormattedMessage id='footer.status' defaultMessage='Status' /></a>
</>
)}
{' · '}
<a href='https://chat.bark.lgbt' target='_blank'><FormattedMessage id='footer.matrix' defaultMessage='Matrix' /></a>
{' · '}
<a href='https://bark.video' target='_blank'><FormattedMessage id='footer.peertube' defaultMessage='Peertube' /></a>
{' · '}
<a href={source_url} rel='noopener noreferrer' target='_blank'><FormattedMessage id='footer.source_code' defaultMessage='View source code' /></a>
{DividingCircle}
<span className='version'>v{version}</span>

2
config/initializers/paperclip.rb
View file

@ -64,7 +64,7 @@ if ENV['S3_ENABLED'] == 'true'
http_open_timeout: ENV.fetch('S3_OPEN_TIMEOUT') { '5' }.to_i,
http_read_timeout: ENV.fetch('S3_READ_TIMEOUT') { '5' }.to_i,
http_idle_timeout: 5,
retry_limit: 0,
retry_limit: 3,
}
)

2
config/sidekiq.yml
View file

@ -60,6 +60,6 @@
class: Scheduler::SuspendedUserCleanupScheduler
queue: scheduler
software_update_check_scheduler:
interval: 30 minutes
interval: 60 minutes
class: Scheduler::SoftwareUpdateCheckScheduler
queue: scheduler