Age | Commit message (Collapse) | Author |
|
|
|
`registrations_mode` (#10269)
* Migrate existing `open_registrations` setting to the new `registrations_mode`
Fixes #10263
* Remove unrelated db changes that have creeped in
|
|
Port SCSS changes from 51e154f5e87968d6bb115e053689767ab33e80cd to glitch-soc
|
|
Port 6e3936aa6f4296ac202b54c0b178b4fa825d7885 to glitch-soc
|
|
Conflicts:
- app/views/admin/settings/edit.html.haml:
Conflict due to how the theming settings change.
|
|
|
|
|
|
Fix #6856
Fix #6951
|
|
|
|
|
|
Bumps [rails](https://github.com/rails/rails) from 5.2.2 to 5.2.2.1. **This update includes security fixes.**
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v5.2.2...v5.2.2.1)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Merge upstream changes
|
|
|
|
|
|
* 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
|
|
Merge upstream changes
|
|
Port 5b50c2cbaa75a07b5f665a0d55cbfd79de67cc63 to glitch-soc
|
|
Port da45b8b4c9bf00495bb967dda38064ac74b85ead to glitch-soc
|
|
Port 65fffeac3f960f9c74d693525a73ac14b201bf2b to glitch-soc
|
|
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
|
|
* 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.
|
|
|
|
|
|
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>
|
|
* 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
|
|
(#10247)
|
|
|
|
|
|
|
|
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>
|
|
* 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.
|
|
Fix #10116
|
|
Merge upstream changes
|
|
|
|
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>
|
|
|
|
|
|
Query by @tateisu
Fix #1554
|
|
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>
|
|
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>
|
|
|
|
Merge upstream changes
|
|
Port front-end parts of 3a92885a860df12b12d8356faf179a3fc63be6f2 to glitch-soc
|
|
|
|
|
|
画面の幅が充分でないときに
表示外にまでボタンが拡大されてしまわないように修正。
|
|
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.
|
|
Fix #10223
|
|
Under load, multiple backups for a single user could be planned, which
is very expensive.
|
|
* 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
|