Thibaut Girka
a1c6e6de1b
Remove leftover console.log
2019-03-11 14:39:45 +01:00
Thibaut Girka
1e4ea4f391
Make clicking on the account and status column headers scroll to top
2019-03-11 14:19:16 +01:00
Thibaut Girka
4849eb8e7f
Make clicking on the account and status column headers scroll to top
2019-03-11 14:19:16 +01:00
Eugen Rochko
e7bc85a91a
Add tootctl statuses remove
to sweep unreferenced statuses ( #10063 )
...
Query by @tateisu
Fix #1554
2019-03-11 13:45:17 +01:00
Eugen Rochko
67665023c3
Add tootctl statuses remove
to sweep unreferenced statuses ( #10063 )
...
Query by @tateisu
Fix #1554
2019-03-11 13:45:17 +01:00
dependabot[bot]
5101d1ea41
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>
2019-03-11 21:31:16 +09:00
dependabot[bot]
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>
2019-03-11 21:31:16 +09:00
dependabot[bot]
d8d9c9b983
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>
2019-03-11 13:29:53 +01:00
dependabot[bot]
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>
2019-03-11 13:29:53 +01:00
ThibG
154c8a0302
Increase DNS timeouts ( #10238 )
2019-03-11 13:27:57 +01:00
ThibG
79b00d294d
Increase DNS timeouts ( #10238 )
2019-03-11 13:27:57 +01:00
ThibG
91045bef61
Merge pull request #953 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-11 13:23:54 +01:00
ThibG
45e4c90a23
Merge pull request #953 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-11 13:23:54 +01:00
Thibaut Girka
3a7fb657f3
[Glitch] Add support for poll ending notifications
...
Port front-end parts of 11ce444b8b
to glitch-soc
2019-03-11 13:08:21 +01:00
Thibaut Girka
9c620fc5c8
[Glitch] Add support for poll ending notifications
...
Port front-end parts of 3a92885a86
to glitch-soc
2019-03-11 13:08:21 +01:00
Thibaut Girka
bd6951a15d
Do not leak instance-local polls to remote followers
2019-03-11 13:08:20 +01:00
Thibaut Girka
7d026aa079
Do not leak instance-local polls to remote followers
2019-03-11 13:08:20 +01:00
ash lea
00bc35891b
add local setting to auto reveal media behind cw
2019-03-11 12:14:45 +01:00
ash lea
f534f4869e
add local setting to auto reveal media behind cw
2019-03-11 12:14:45 +01:00
Kirishima21
2172dec88d
fix poll fotter layout
...
画面の幅が充分でないときに
表示外にまでボタンが拡大されてしまわないように修正。
2019-03-11 12:09:30 +01:00
Kirishima21
1bf035fb67
fix poll fotter layout
...
画面の幅が充分でないときに
表示外にまでボタンが拡大されてしまわないように修正。
2019-03-11 12:09:30 +01:00
Thibaut Girka
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.
2019-03-11 11:23:50 +01:00
Thibaut Girka
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.
2019-03-11 11:23:50 +01:00
Eugen Rochko
5bc62cee47
Fix streaming API always attempting to use SSL with Postgres ( #10231 )
...
Fix #10223
2019-03-11 00:51:23 +01:00
Eugen Rochko
13a7f05030
Fix streaming API always attempting to use SSL with Postgres ( #10231 )
...
Fix #10223
2019-03-11 00:51:23 +01:00
ThibG
cdf5a7f854
Avoid race conditions when creating backups ( #10234 )
...
Under load, multiple backups for a single user could be planned, which
is very expensive.
2019-03-11 00:50:31 +01:00
ThibG
5506b9406d
Avoid race conditions when creating backups ( #10234 )
...
Under load, multiple backups for a single user could be planned, which
is very expensive.
2019-03-11 00:50:31 +01:00
ThibG
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
2019-03-11 00:49:31 +01:00
ThibG
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
2019-03-11 00:49:31 +01:00
ThibG
dc285ec4ca
Merge pull request #950 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-10 20:43:54 +01:00
ThibG
3cef04610c
Merge pull request #950 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-10 20:43:54 +01:00
Thibaut Girka
88d4b28714
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-10 16:48:44 +01:00
Thibaut Girka
dfe7322922
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-10 16:48:44 +01:00
ThibG
05aa8b9303
Reject existing Follows when suspending a remote account ( #10230 )
...
* Reject existing Follows when suspending a remote account
Partial fix to #10229
* Add tests
2019-03-10 16:18:58 +01:00
ThibG
c11dff5049
Reject existing Follows when suspending a remote account ( #10230 )
...
* Reject existing Follows when suspending a remote account
Partial fix to #10229
* Add tests
2019-03-10 16:18:58 +01:00
Eugen Rochko
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
2019-03-10 16:00:54 +01:00
Eugen Rochko
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
2019-03-10 16:00:54 +01:00
Armand Fardeau
31c7cd0942
Add clearer error when/if gpg fails to install ( #10228 )
2019-03-10 16:00:22 +01:00
Armand Fardeau
b6bc98c480
Add clearer error when/if gpg fails to install ( #10228 )
2019-03-10 16:00:22 +01:00
Aditoo17
caa40e9d9b
Change joinmastodon.org to joinmastodon.org/#getting-started for sign up on another server ( #10224 )
2019-03-09 17:07:59 +01:00
Aditoo17
6c0a96912a
Change joinmastodon.org to joinmastodon.org/#getting-started for sign up on another server ( #10224 )
2019-03-09 17:07:59 +01:00
ThibG
dad42ecee0
Merge pull request #947 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-08 20:43:51 +01:00
ThibG
42cc93e892
Merge pull request #947 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-08 20:43:51 +01:00
Thibaut Girka
96e7f430de
Fix min/max duration poll limits being inverted
2019-03-08 20:43:18 +01:00
Thibaut Girka
93daa97fc3
Fix min/max duration poll limits being inverted
2019-03-08 20:43:18 +01:00
Thibaut Girka
bed7758022
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-08 20:15:57 +01:00
Thibaut Girka
674fe32f97
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-08 20:15:57 +01:00
ThibG
32f0cc5ccd
Fix setting up fields of a previously suspended account ( #10222 )
...
Fix #10177 for real
2019-03-08 19:59:08 +01:00
ThibG
3f4a6d44fe
Fix setting up fields of a previously suspended account ( #10222 )
...
Fix #10177 for real
2019-03-08 19:59:08 +01:00
Ben Lubar
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.
2019-03-08 16:12:48 +01:00