bd6951a15d
Do not leak instance-local polls to remote followers
6 years ago
33001891b6
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/services/post_status_service.rb
Small conflict due to handling of instance-local toots.
A subsequent change is required to ensure instance-local polls are not leaked
through Update.
6 years ago
5bc62cee47
Fix streaming API always attempting to use SSL with Postgres ( #10231 )
...
Fix #10223
6 years ago
cdf5a7f854
Avoid race conditions when creating backups ( #10234 )
...
Under load, multiple backups for a single user could be planned, which
is very expensive.
6 years ago
11ce444b8b
Support pushing and receiving updates to poll tallies ( #10209 )
...
* Process incoming poll tallies update
* Send Update on poll vote
* Do not send Updates for a poll more often than once every 3 minutes
* Include voters in people to notify of results update
* Schedule closing poll worker on poll creation
* Add new notification type for ending polls
* Add front-end support for ended poll notifications
* Fix UpdatePollSerializer
* Fix Updates not being triggered by local votes
* Fix tests failure
* Fix web push notifications for closing polls
* Minor cleanup
* Notify voters of both remote and local polls when those close
* Fix delivery of poll updates to mentioned accounts and voters
6 years ago
dc285ec4ca
Merge pull request #950 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
88d4b28714
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
05aa8b9303
Reject existing Follows when suspending a remote account ( #10230 )
...
* Reject existing Follows when suspending a remote account
Partial fix to #10229
* Add tests
6 years ago
d182fec01a
Fix SSL configuration regression in streaming API ( #10225 )
...
* Fix SSL configuration regression in streaming API
Fix #10223
* Fix code style issues and integrate #10219
* Fix dumb thing
6 years ago
31c7cd0942
Add clearer error when/if gpg fails to install ( #10228 )
6 years ago
caa40e9d9b
Change joinmastodon.org to joinmastodon.org/#getting-started for sign up on another server ( #10224 )
6 years ago
dad42ecee0
Merge pull request #947 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
96e7f430de
Fix min/max duration poll limits being inverted
6 years ago
bed7758022
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
32f0cc5ccd
Fix setting up fields of a previously suspended account ( #10222 )
...
Fix #10177 for real
6 years ago
f461d0a193
Re-organize Dockerfile to improve incremental builds. ( #10212 )
...
- Always run apt update before any other apt command. (This fixes
incremental builds failing if a remote package is updated.)
- Only copy dependency lists before installing dependencies. (This means
editing code doesn't force all dependencies to be re-downloaded.)
- Delete cache in the same layer that it is created. (Otherwise,
deleting cache *increases* the size of the image on non-squashed
builds.)
- Move the installation of some static dependencies to *before* Mastodon
code is imported to Docker.
6 years ago
291fbe21c2
config: add DB_SSLMODE for managed/remote PG ( #10210 )
...
* config: add DB_SSLMODE for managed/remote PG
* streaming: set PG sslmode, defaults to prefer
6 years ago
51faba7b59
Bump pkg-config from 1.3.4 to 1.3.5 ( #10218 )
...
Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config ) from 1.3.4 to 1.3.5.
- [Release notes](https://github.com/ruby-gnome2/pkg-config/releases )
- [Changelog](https://github.com/ruby-gnome2/pkg-config/blob/master/NEWS )
- [Commits](https://github.com/ruby-gnome2/pkg-config/compare/1.3.4...1.3.5 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
5baae3d9c0
Merge pull request #945 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
b9a799c343
[Glitch] Fix NaN in Poll component
...
Port 19cccea89a
6 years ago
7565b8afa3
[Glitch] Fix public timelines being broken by new toots when they are not mounted
...
Port 8e9db67a6a
6 years ago
9b093dfcde
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
dcbe6c16ba
Do not allow adding votes to expired polls ( #10214 )
...
* Do not allow adding votes to expired polls
* Only validate expires_at on create
6 years ago
b7a8a52bc5
Immediately display poll results to poll author ( #10187 )
...
* Immediately display poll results to poll author
* Refactor Poll#loaded_options and add Poll#voted? to improve DRYness
6 years ago
19cccea89a
Fix NaN in Poll component ( #10213 )
6 years ago
8e9db67a6a
Fix public timelines being broken by new toots when they are not mounted ( #10131 )
6 years ago
641384d288
Handle StaleObjectError when retrieving polls ( #10208 )
6 years ago
51e37e9d6a
Merge pull request #944 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
d8d8c64965
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
adc68b7a2e
Bump webpush from 0.3.6 to 0.3.7 ( #10205 )
...
Bumps [webpush](https://github.com/zaru/webpush ) from 0.3.6 to 0.3.7.
- [Release notes](https://github.com/zaru/webpush/releases )
- [Changelog](https://github.com/zaru/webpush/blob/master/CHANGELOG.md )
- [Commits](https://github.com/zaru/webpush/compare/v0.3.6...v0.3.7 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
5232eccc5c
i18n: 🇵🇱 ( #10199 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
6 years ago
db21a6c5ee
Avoid unnecessarily fetching the replies collection when it is empty ( #10201 )
6 years ago
401a3cfdf0
Fix AddLockVersionToPolls migration ( #10200 )
6 years ago
ed3d470069
Fix #10202 ( #10203 )
6 years ago
a9597fd8a6
Allow setting whether this is a single choice poll or multiple choices one
6 years ago
81a92465f2
Disable file upload when there is a poll
6 years ago
49c4e57973
Use server-provided poll limits instead of hardcoded ones
...
Also does not enable polls if no limits are provided by the server
6 years ago
9f06da948b
Serialize poll limits in instance serializer and initial state
6 years ago
e2d56cc90d
[Glitch] Port polls creation UI from upstream
6 years ago
8124b60a99
Fix AddLockVersionToPolls migration
6 years ago
cff221b519
Merge pull request #942 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
6b4eb1ac96
[Glitch] Disable the underlying button element when an ItemButton is disabled
...
Port 365f875f57
6 years ago
f123b809a7
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
4f2eb43d8a
Add optimistic lock to avoid race conditions when handling votes ( #10196 )
...
* Add optimistic lock to avoid race conditions when handling votes
* Force-reload polls when getting `ActiveRecord::StaleObjectError`
6 years ago
365f875f57
Disable the underlying button element when an ItemButton is disabled ( #10194 )
...
Fixes #10191
6 years ago
0b7c53937f
Disable file upload when there is a poll ( #10195 )
6 years ago
8d82e153f3
Add an icon to highlight polls behind a Content Warning
6 years ago
1397836898
Merge pull request #939 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
9844b44e99
Fix poll options not rendering text after vote/refresh
...
Port 9cae3a3b48
6 years ago
31017d18a5
Avoid line breaks in poll options
...
Port 0d8890f073
6 years ago
Thibaut Girka
Eugen Rochko
Armand Fardeau
Aditoo17
Ben Lubar
Sascha
dependabot[bot]
marcin mikołajczak
rinsuki