c2857c976c
Merge pull request #955 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
f3e7634156
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
c8122e84cc
Bump aws-sdk-s3 from 1.30.1 to 1.31.0 ( #10236 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.30.1 to 1.31.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/1.30.1...1.31.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
a1c6e6de1b
Remove leftover console.log
6 years ago
4849eb8e7f
Make clicking on the account and status column headers scroll to top
6 years ago
67665023c3
Add `tootctl statuses remove` to sweep unreferenced statuses ( #10063 )
...
Query by @tateisu
Fix #1554
6 years ago
a558ef45d8
Bump pkg-config from 1.3.5 to 1.3.6 ( #10235 )
...
Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config ) from 1.3.5 to 1.3.6.
- [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.5...1.3.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
0a2e5abece
Bump active_record_query_trace from 1.6 to 1.6.1 ( #10237 )
...
Bumps [active_record_query_trace](https://github.com/brunofacca/active-record-query-trace ) from 1.6 to 1.6.1.
- [Release notes](https://github.com/brunofacca/active-record-query-trace/releases )
- [Changelog](https://github.com/brunofacca/active-record-query-trace/blob/master/HISTORY.md )
- [Commits](https://github.com/brunofacca/active-record-query-trace/compare/v1.6...v1.6.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
79b00d294d
Increase DNS timeouts ( #10238 )
6 years ago
45e4c90a23
Merge pull request #953 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
9c620fc5c8
[Glitch] Add support for poll ending notifications
...
Port front-end parts of 3a92885a86
6 years ago
7d026aa079
Do not leak instance-local polls to remote followers
6 years ago
f534f4869e
add local setting to auto reveal media behind cw
6 years ago
1bf035fb67
fix poll fotter layout
...
画面の幅が充分でないときに
表示外にまでボタンが拡大されてしまわないように修正。
6 years ago
89bee860cd
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
13a7f05030
Fix streaming API always attempting to use SSL with Postgres ( #10231 )
...
Fix #10223
6 years ago
5506b9406d
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
3a92885a86
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
3cef04610c
Merge pull request #950 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
dfe7322922
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
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
ThibG
dependabot[bot]
Eugen Rochko
ash lea
Kirishima21
Armand Fardeau
Aditoo17
Ben Lubar
Sascha
marcin mikołajczak
rinsuki