]>
cat aescling's git repositories - mastodon.git/log
ThibG [Wed, 13 Mar 2019 22:44:37 +0000 (23:44 +0100)]
Merge pull request #958 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
ThibG [Wed, 13 Mar 2019 18:29:54 +0000 (19:29 +0100)]
[Glitch] Add UI for enabling/disabling poll notifications
Thibaut Girka [Wed, 13 Mar 2019 20:35:43 +0000 (21:35 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream
ThibG [Wed, 13 Mar 2019 18:29:54 +0000 (19:29 +0100)]
Add UI for enabling/disabling poll notifications (#10255)
* Add UI for enabling/disabling poll notifications
* Add poll notifications to the (advanced) quick filter bar
* Update poll notification message
“Your poll has ended” → “A poll you have voted in has ended”
* Clear up associated notifications when a poll is deleted
ThibG [Wed, 13 Mar 2019 15:55:07 +0000 (16:55 +0100)]
Merge pull request #957 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Eugen Rochko [Tue, 12 Mar 2019 21:08:18 +0000 (22:08 +0100)]
[Glitch] Add muted style for polls in web UI
Port
5b50c2cbaa75a07b5f665a0d55cbfd79de67cc63 to glitch-soc
Eugen Rochko [Tue, 12 Mar 2019 20:53:56 +0000 (21:53 +0100)]
[Glitch] Fix public timeline page not paginating correctly
Port
da45b8b4c9bf00495bb967dda38064ac74b85ead to glitch-soc
Eugen Rochko [Tue, 12 Mar 2019 16:34:00 +0000 (17:34 +0100)]
[Glitch] Redesign landing page
Port
65fffeac3f960f9c74d693525a73ac14b201bf2b to glitch-soc
Thibaut Girka [Wed, 13 Mar 2019 14:16:02 +0000 (15:16 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/about_controller.rb
- app/controllers/tags_controller.rb
- app/views/about/show.html.haml
- spec/views/about/show.html.haml_spec.rb
mayaeh [Wed, 13 Mar 2019 13:56:40 +0000 (22:56 +0900)]
i18n: Add Japanese translations for new landing page (#10254)
* yarn manage:translations && i18n-tasks add-missing
* Update Japanese translations for new landing page.
I don't change the tagline from English yet.
I think that translating a tagline is difficult and requires time-consuming discussions.
Some translations related about the poll are already done in Weblate, so I will leave it as it is.
Eugen Rochko [Wed, 13 Mar 2019 12:02:13 +0000 (13:02 +0100)]
Fix `tagged` param not being normalized before querying tags (#10249)
mayaeh [Wed, 13 Mar 2019 12:01:57 +0000 (21:01 +0900)]
Fix to limit to discoverable accounts. (#10253)
dependabot[bot] [Wed, 13 Mar 2019 05:57:02 +0000 (14:57 +0900)]
Bump active_record_query_trace from 1.6.1 to 1.6.2 (#10252)
Bumps [active_record_query_trace](https://github.com/brunofacca/active-record-query-trace) from 1.6.1 to 1.6.2.
- [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.1...v1.6.2)
Signed-off-by: dependabot[bot] <support@dependabot.com>
Eugen Rochko [Tue, 12 Mar 2019 21:58:59 +0000 (22:58 +0100)]
Fix poll update handler calling method was that was not available (#10246)
* Fix poll update handler calling method was that was not available
Fix regression from #10209
* Refactor VoteService
* Refactor ActivityPub::DistributePollUpdateWorker and optimize it
* Fix typo
* Fix typo
Eugen Rochko [Tue, 12 Mar 2019 21:34:55 +0000 (22:34 +0100)]
Optimize RemoveStatusService by removing n+1 query and using shared inboxes (#10247)
Eugen Rochko [Tue, 12 Mar 2019 21:08:18 +0000 (22:08 +0100)]
Add muted style for polls in web UI (#10248)
Eugen Rochko [Tue, 12 Mar 2019 20:53:56 +0000 (21:53 +0100)]
Fix public timeline page not paginating correctly (#10245)
Eugen Rochko [Tue, 12 Mar 2019 16:34:00 +0000 (17:34 +0100)]
Redesign landing page (#10232)
dependabot[bot] [Tue, 12 Mar 2019 12:05:20 +0000 (13:05 +0100)]
Bump concurrent-ruby from 1.1.4 to 1.1.5 (#10242)
Bumps [concurrent-ruby](https://github.com/ruby-concurrency/concurrent-ruby) from 1.1.4 to 1.1.5.
- [Release notes](https://github.com/ruby-concurrency/concurrent-ruby/releases)
- [Changelog](https://github.com/ruby-concurrency/concurrent-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ruby-concurrency/concurrent-ruby/compare/v1.1.4...v1.1.5)
Signed-off-by: dependabot[bot] <support@dependabot.com>
Aurélien Reeves [Mon, 11 Mar 2019 19:48:24 +0000 (20:48 +0100)]
Squish username before validation (#10239)
* Squish username before validation (#10101)
Fix #10101
* Move before_validation hook to a private method
Also add Unicode wite-spaces to the spec to support the use of squish
over strip.
Eugen Rochko [Mon, 11 Mar 2019 19:47:50 +0000 (20:47 +0100)]
Fix remote interaction dialogs being indexed by search engines (#10240)
Fix #10116
ThibG [Mon, 11 Mar 2019 16:52:18 +0000 (17:52 +0100)]
Merge pull request #955 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Thibaut Girka [Mon, 11 Mar 2019 16:31:02 +0000 (17:31 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream
dependabot[bot] [Mon, 11 Mar 2019 14:29:07 +0000 (15:29 +0100)]
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>
Thibaut Girka [Mon, 11 Mar 2019 13:39:14 +0000 (14:39 +0100)]
Remove leftover console.log
Thibaut Girka [Fri, 8 Mar 2019 19:34:31 +0000 (20:34 +0100)]
Make clicking on the account and status column headers scroll to top
Eugen Rochko [Mon, 11 Mar 2019 12:45:17 +0000 (13:45 +0100)]
Add `tootctl statuses remove` to sweep unreferenced statuses (#10063)
Query by @tateisu
Fix #1554
dependabot[bot] [Mon, 11 Mar 2019 12:31:16 +0000 (21:31 +0900)]
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>
dependabot[bot] [Mon, 11 Mar 2019 12:29:53 +0000 (13:29 +0100)]
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>
ThibG [Mon, 11 Mar 2019 12:27:57 +0000 (13:27 +0100)]
Increase DNS timeouts (#10238)
ThibG [Mon, 11 Mar 2019 12:23:54 +0000 (13:23 +0100)]
Merge pull request #953 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Thibaut Girka [Mon, 11 Mar 2019 10:32:21 +0000 (11:32 +0100)]
[Glitch] Add support for poll ending notifications
Port front-end parts of
3a92885a860df12b12d8356faf179a3fc63be6f2 to glitch-soc
Thibaut Girka [Mon, 11 Mar 2019 10:25:38 +0000 (11:25 +0100)]
Do not leak instance-local polls to remote followers
ash lea [Sun, 10 Mar 2019 19:34:51 +0000 (15:34 -0400)]
add local setting to auto reveal media behind cw
Kirishima21 [Mon, 11 Mar 2019 06:57:00 +0000 (15:57 +0900)]
fix poll fotter layout
画面の幅が充分でないときに
表示外にまでボタンが拡大されてしまわないように修正。
Thibaut Girka [Mon, 11 Mar 2019 10:23:50 +0000 (11:23 +0100)]
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.
Eugen Rochko [Sun, 10 Mar 2019 23:51:23 +0000 (00:51 +0100)]
Fix streaming API always attempting to use SSL with Postgres (#10231)
Fix #10223
ThibG [Sun, 10 Mar 2019 23:50:31 +0000 (00:50 +0100)]
Avoid race conditions when creating backups (#10234)
Under load, multiple backups for a single user could be planned, which
is very expensive.
ThibG [Sun, 10 Mar 2019 23:49:31 +0000 (00:49 +0100)]
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
ThibG [Sun, 10 Mar 2019 19:43:54 +0000 (20:43 +0100)]
Merge pull request #950 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Thibaut Girka [Sun, 10 Mar 2019 15:48:44 +0000 (16:48 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream
ThibG [Sun, 10 Mar 2019 15:18:58 +0000 (16:18 +0100)]
Reject existing Follows when suspending a remote account (#10230)
* Reject existing Follows when suspending a remote account
Partial fix to #10229
* Add tests
Eugen Rochko [Sun, 10 Mar 2019 15:00:54 +0000 (16:00 +0100)]
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
Armand Fardeau [Sun, 10 Mar 2019 15:00:22 +0000 (16:00 +0100)]
Add clearer error when/if gpg fails to install (#10228)
Aditoo17 [Sat, 9 Mar 2019 16:07:59 +0000 (17:07 +0100)]
Change joinmastodon.org to joinmastodon.org/#getting-started for sign up on another server (#10224)
ThibG [Fri, 8 Mar 2019 19:43:51 +0000 (20:43 +0100)]
Merge pull request #947 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Thibaut Girka [Fri, 8 Mar 2019 19:20:40 +0000 (20:20 +0100)]
Fix min/max duration poll limits being inverted
Thibaut Girka [Fri, 8 Mar 2019 19:15:57 +0000 (20:15 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream
ThibG [Fri, 8 Mar 2019 18:59:08 +0000 (19:59 +0100)]
Fix setting up fields of a previously suspended account (#10222)
Fix #10177 for real
Ben Lubar [Fri, 8 Mar 2019 15:12:48 +0000 (09:12 -0600)]
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.
Sascha [Fri, 8 Mar 2019 13:36:28 +0000 (14:36 +0100)]
config: add DB_SSLMODE for managed/remote PG (#10210)
* config: add DB_SSLMODE for managed/remote PG
* streaming: set PG sslmode, defaults to prefer
dependabot[bot] [Fri, 8 Mar 2019 10:16:55 +0000 (19:16 +0900)]
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>
ThibG [Fri, 8 Mar 2019 00:47:36 +0000 (01:47 +0100)]
Merge pull request #945 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Eugen Rochko [Thu, 7 Mar 2019 21:18:05 +0000 (22:18 +0100)]
[Glitch] Fix NaN in Poll component
Port
75cb93676b1dd41d3e47f62466c0c6430691a990 to glitch-soc
Eugen Rochko [Thu, 7 Mar 2019 21:17:52 +0000 (22:17 +0100)]
[Glitch] Fix public timelines being broken by new toots when they are not mounted
Port
be1c634b2b4372a525d304d2ff830392f04c5cc5 to glitch-soc
Thibaut Girka [Thu, 7 Mar 2019 23:57:13 +0000 (00:57 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream
ThibG [Thu, 7 Mar 2019 23:54:50 +0000 (00:54 +0100)]
Do not allow adding votes to expired polls (#10214)
* Do not allow adding votes to expired polls
* Only validate expires_at on create
Eugen Rochko [Thu, 7 Mar 2019 21:53:47 +0000 (22:53 +0100)]
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
Eugen Rochko [Thu, 7 Mar 2019 21:18:05 +0000 (22:18 +0100)]
Fix NaN in Poll component (#10213)
Eugen Rochko [Thu, 7 Mar 2019 21:17:52 +0000 (22:17 +0100)]
Fix public timelines being broken by new toots when they are not mounted (#10131)
ThibG [Thu, 7 Mar 2019 14:52:38 +0000 (15:52 +0100)]
Handle StaleObjectError when retrieving polls (#10208)
ThibG [Thu, 7 Mar 2019 12:45:43 +0000 (13:45 +0100)]
Merge pull request #944 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Thibaut Girka [Thu, 7 Mar 2019 12:24:30 +0000 (13:24 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream
dependabot[bot] [Thu, 7 Mar 2019 11:38:10 +0000 (20:38 +0900)]
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>
marcin mikołajczak [Thu, 7 Mar 2019 01:52:43 +0000 (02:52 +0100)]
i18n:🇵🇱 (#10199)
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
ThibG [Thu, 7 Mar 2019 00:50:37 +0000 (01:50 +0100)]
Avoid unnecessarily fetching the replies collection when it is empty (#10201)
ThibG [Thu, 7 Mar 2019 00:50:06 +0000 (01:50 +0100)]
Fix AddLockVersionToPolls migration (#10200)
rinsuki [Thu, 7 Mar 2019 00:49:42 +0000 (09:49 +0900)]
Fix #10202 (#10203)
Thibaut Girka [Wed, 6 Mar 2019 13:18:29 +0000 (14:18 +0100)]
Allow setting whether this is a single choice poll or multiple choices one
Thibaut Girka [Wed, 6 Mar 2019 12:52:14 +0000 (13:52 +0100)]
Disable file upload when there is a poll
Thibaut Girka [Wed, 6 Mar 2019 12:42:48 +0000 (13:42 +0100)]
Use server-provided poll limits instead of hardcoded ones
Also does not enable polls if no limits are provided by the server
Thibaut Girka [Wed, 6 Mar 2019 12:36:09 +0000 (13:36 +0100)]
Serialize poll limits in instance serializer and initial state
Thibaut Girka [Wed, 6 Mar 2019 11:30:11 +0000 (12:30 +0100)]
[Glitch] Port polls creation UI from upstream
Thibaut Girka [Wed, 6 Mar 2019 22:06:09 +0000 (23:06 +0100)]
Fix AddLockVersionToPolls migration
ThibG [Wed, 6 Mar 2019 21:59:07 +0000 (22:59 +0100)]
Merge pull request #942 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
ThibG [Wed, 6 Mar 2019 14:10:32 +0000 (15:10 +0100)]
[Glitch] Disable the underlying button element when an ItemButton is disabled
Port
b3668a79eca2d185ea57a9ffc2fa012db52e49f0 to glitch-soc
Thibaut Girka [Wed, 6 Mar 2019 21:39:22 +0000 (22:39 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream
ThibG [Wed, 6 Mar 2019 18:53:57 +0000 (19:53 +0100)]
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`
ThibG [Wed, 6 Mar 2019 14:10:32 +0000 (15:10 +0100)]
Disable the underlying button element when an ItemButton is disabled (#10194)
Fixes #10191
ThibG [Wed, 6 Mar 2019 14:09:18 +0000 (15:09 +0100)]
Disable file upload when there is a poll (#10195)
Thibaut Girka [Wed, 6 Mar 2019 11:21:18 +0000 (12:21 +0100)]
Add an icon to highlight polls behind a Content Warning
ThibG [Wed, 6 Mar 2019 11:20:17 +0000 (12:20 +0100)]
Merge pull request #939 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Eugen Rochko [Wed, 6 Mar 2019 04:35:52 +0000 (05:35 +0100)]
Fix poll options not rendering text after vote/refresh
Port
fd128b9c7aa5c71adbfc2e223212514c0baee675 to glitch-soc
Eugen Rochko [Wed, 6 Mar 2019 03:54:32 +0000 (04:54 +0100)]
Avoid line breaks in poll options
Port
57643557b64bc1853c4aeb65fc652dac3467fa18 to glitch-soc
Eugen Rochko [Wed, 6 Mar 2019 02:57:46 +0000 (03:57 +0100)]
Render unicode emoji in polls using emoji pack
Port
4407f07014096bcbaf5a06015a5791984282846d to glitch-soc
Thibaut Girka [Wed, 6 Mar 2019 10:29:06 +0000 (11:29 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream
dependabot[bot] [Wed, 6 Mar 2019 05:58:13 +0000 (14:58 +0900)]
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>
Eugen Rochko [Wed, 6 Mar 2019 04:35:52 +0000 (05:35 +0100)]
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
Eugen Rochko [Wed, 6 Mar 2019 03:54:32 +0000 (04:54 +0100)]
Avoid line breaks in poll options (#10188)
Eugen Rochko [Wed, 6 Mar 2019 03:54:11 +0000 (04:54 +0100)]
Fix poll validation issues (#10186)
- Fix missing interpolation argument in PollValidator
- Fix PollValidator rejecting exact allowed min/max durations
Eugen Rochko [Wed, 6 Mar 2019 03:53:37 +0000 (04:53 +0100)]
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
Eugen Rochko [Wed, 6 Mar 2019 02:57:46 +0000 (03:57 +0100)]
Render unicode emoji in polls using emoji pack (#10185)
Thibaut Girka [Tue, 5 Mar 2019 22:17:09 +0000 (23:17 +0100)]
Fix toots opening in dynamic column when trying to interact with them
This fixes inline preview cards and polls, preventing them from opening
the toot in detailed view when clicking on an interactive element.
ThibG [Tue, 5 Mar 2019 23:20:30 +0000 (00:20 +0100)]
Merge pull request #938 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Thibaut Girka [Tue, 5 Mar 2019 23:03:46 +0000 (00:03 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream
ThibG [Tue, 5 Mar 2019 22:58:58 +0000 (23:58 +0100)]
Fix newlines in OStatus and RSS serializations (#10183)
Thibaut Girka [Tue, 5 Mar 2019 21:51:23 +0000 (22:51 +0100)]
[Glitch] Perform deep comparison for card data when receiving new props
Prevents embedded players from resetting when interacting with the toot
Marek Ľach [Tue, 5 Mar 2019 21:42:37 +0000 (22:42 +0100)]
Minor update for Slovak tr (#10181)
* Minor update for Slovak tr
* Update sk.yml
* Update sk.yml
ThibG [Tue, 5 Mar 2019 21:20:58 +0000 (22:20 +0100)]
Merge pull request #935 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Aditoo17 [Tue, 5 Mar 2019 21:13:04 +0000 (22:13 +0100)]
I18n: Update Czech pluralization (#10182)