c11dff5049
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
dbeab5a036
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
b6bc98c480
Add clearer error when/if gpg fails to install ( #10228 )
6 years ago
6c0a96912a
Change joinmastodon.org to joinmastodon.org/#getting-started for sign up on another server ( #10224 )
6 years ago
42cc93e892
Merge pull request #947 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
93daa97fc3
Fix min/max duration poll limits being inverted
6 years ago
674fe32f97
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
3f4a6d44fe
Fix setting up fields of a previously suspended account ( #10222 )
...
Fix #10177 for real
6 years ago
d36fcb54c4
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
42e733681a
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
9e33a71efa
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
29a09858f6
Merge pull request #945 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
ca45198ccb
[Glitch] Fix NaN in Poll component
...
Port 75cb93676b
6 years ago
6fe48dd050
[Glitch] Fix public timelines being broken by new toots when they are not mounted
...
Port be1c634b2b
6 years ago
5528719bc9
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
3aaac4f134
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
054bbb3da2
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
75cb93676b
Fix NaN in Poll component ( #10213 )
6 years ago
be1c634b2b
Fix public timelines being broken by new toots when they are not mounted ( #10131 )
6 years ago
09c042aa10
Handle StaleObjectError when retrieving polls ( #10208 )
6 years ago
38e9c66f34
Merge pull request #944 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
9c5e7805cc
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
637c952ccb
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
44475bbc9c
i18n: 🇵🇱 ( #10199 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
6 years ago
34f261e6af
Avoid unnecessarily fetching the replies collection when it is empty ( #10201 )
6 years ago
dfb45374d2
Fix AddLockVersionToPolls migration ( #10200 )
6 years ago
f44091d653
Fix #10202 ( #10203 )
6 years ago
84c807a0dc
Allow setting whether this is a single choice poll or multiple choices one
6 years ago
cb6e351f4d
Disable file upload when there is a poll
6 years ago
235be596bc
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
3b1390dc78
Serialize poll limits in instance serializer and initial state
6 years ago
8fe86cebaa
[Glitch] Port polls creation UI from upstream
6 years ago
3e5a0bc825
Fix AddLockVersionToPolls migration
6 years ago
da8ce25fa1
Merge pull request #942 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
6e295beab2
[Glitch] Disable the underlying button element when an ItemButton is disabled
...
Port b3668a79ec
6 years ago
cf4fd8bcfe
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
96f905f409
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
b3668a79ec
Disable the underlying button element when an ItemButton is disabled ( #10194 )
...
Fixes #10191
6 years ago
cb217444b8
Disable file upload when there is a poll ( #10195 )
6 years ago
1bb23100b1
Add an icon to highlight polls behind a Content Warning
6 years ago
fefacb7b7a
Merge pull request #939 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
94a0149ff3
Fix poll options not rendering text after vote/refresh
...
Port fd128b9c7a
6 years ago
94f1a751bf
Avoid line breaks in poll options
...
Port 57643557b6
6 years ago
7f32d675b0
Render unicode emoji in polls using emoji pack
...
Port 4407f07014
6 years ago
4806232997
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ad6f7ea250
Bump active_record_query_trace from 1.5.4 to 1.6 ( #10192 )
...
Bumps [active_record_query_trace](https://github.com/brunofacca/active-record-query-trace ) from 1.5.4 to 1.6.
- [Release notes](https://github.com/brunofacca/active-record-query-trace/releases )
- [Changelog](https://github.com/brunofacca/active-record-query-trace/blob/v1.6/HISTORY.md )
- [Commits](https://github.com/brunofacca/active-record-query-trace/compare/v1.5.4...v1.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
fd128b9c7a
Fix poll options not rendering text after vote/refresh ( #10189 )
...
* Fix poll options not rendering text after vote/refresh
* Fix poll options not showing up on public pages
* Fix code style issue
6 years ago
57643557b6
Avoid line breaks in poll options ( #10188 )
6 years ago
5996be994d
Fix poll validation issues ( #10186 )
...
- Fix missing interpolation argument in PollValidator
- Fix PollValidator rejecting exact allowed min/max durations
6 years ago
d97cbb0da6
Add UI for creating polls ( #10184 )
...
* Add actions and reducers for polls
* Add poll button
* Disable media upload if poll enabled
* Add poll form
* Make delete & redraft work with polls
6 years ago
ThibG