gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'parent/main' into kb_migration

Browse source
This commit is contained in:
KMY 2023-07-18 11:35:02 +09:00
commit a56a732dd2
57 changed files with 986 additions and 605 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/statuses/_poll.html.haml
View file

@ -17,7 +17,7 @@
%span.poll__voted
%i.poll__voted__mark.fa.fa-check
%progress{ max: 100, value: percent < 1 ? 1 : percent, 'aria-hidden': 'true' }
%progress{ max: 100, value: [percent, 1].max, 'aria-hidden': 'true' }
%span.poll__chart
- else
%label.poll__option><

2
app/views/statuses/show.html.haml
View file

@ -17,7 +17,7 @@
= opengraph 'og:title', "#{display_name(@account)} (#{acct(@account)})"
= opengraph 'og:url', short_account_status_url(@account, @status)
= opengraph 'og:published_time', @status.created_at.iso8601
= opengraph 'profile:username', acct(@account)[1..-1]
= opengraph 'profile:username', acct(@account)[1..]
= render 'og_description', activity: @status
= render 'og_image', activity: @status, account: @account