Age | Commit message (Collapse) | Author |
|
(Even though that codepath is probably never actually used…)
|
|
elements
|
|
|
|
Merge upstream changes
|
|
|
|
Port ecd303c097bf20aa971628ba8420a9f17f3dd1f7 to glitch-soc
|
|
Port 73be8f38c115c279e3d3961b98bd2b82b9706b05 to glitch-soc
|
|
Conflicts:
- app/javascript/packs/public.js
- app/models/user.rb
- config/settings.yml
- db/schema.rb
Moved public.js changes to settings.js.
|
|
* Add setting to not aggregate reblogs
Fixes #9222
* Handle cases where user is nil in add_to_home and add_to_list
* Add hint for setting_aggregate_reblogs option
* Reword setting_aggregate_reblogs label
|
|
|
|
|
|
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
|
|
|
|
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.61.0 to 0.61.1.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.61.0...v0.61.1)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
* fix non-escaped html in the profile settings
* provide a default profile text in case if there's no custom one
* update haml syntax
* simplify default profile name to username
* sanitize user-input html but display emojified icons
|
|
|
|
|
|
Since dots are not allowed in username,
this spec is no longer needed.
|
|
|
|
* Fix missing variable in directory page title
* Order hashtags by number of people instead of alphabetically
* Add icon to OpenGraph preview of directory page
* Prevent line breaks in hashtags and ensure lowercase in the table
|
|
|
|
Merge upstream changes
|
|
Fix #5578
|
|
|
|
This reverts commit 58a29db99d410771f62ffb9e8c2ce95e1d3cb4ae.
|
|
|
|
`#from_account` isn't defined.
|
|
|
|
Bumps [rails](https://github.com/rails/rails) from 5.2.1.1 to 5.2.2.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v5.2.1.1...v5.2.2)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [rails-controller-testing](https://github.com/rails/rails-controller-testing) from 1.0.3 to 1.0.4.
- [Release notes](https://github.com/rails/rails-controller-testing/releases)
- [Commits](https://github.com/rails/rails-controller-testing/compare/v1.0.3...v1.0.4)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.60.0 to 0.61.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.60.0...v0.61.0)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
(#9437)
* Use `update_column` instead of `update_attribute` in callback
`update_attribute` would normally cause callbacks to be called.
Called from a callback, it seems to stop further callbacks from executing.
`update_column` does the same work, but without calling callbacks or
preventing other callbacks from executing.
* Fix deadlocks by moving account stats update outside transaction
|
|
* add RelativeTimestamp elements
* style the elements properly with CSS
|
|
* Add test that should currently fail
* Fix depth computation (will still fail if statuses have been filtered out)
* Fix handling of broken threads
|
|
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.11.1 to 3.12.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.11.1...3.12.0)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [rails-controller-testing](https://github.com/rails/rails-controller-testing) from 1.0.2 to 1.0.3.
- [Release notes](https://github.com/rails/rails-controller-testing/releases)
- [Commits](https://github.com/rails/rails-controller-testing/compare/v1.0.2...v1.0.3)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
Bumps [pry-rails](https://github.com/rweng/pry-rails) from 0.3.7 to 0.3.8.
- [Release notes](https://github.com/rweng/pry-rails/releases)
- [Commits](https://github.com/rweng/pry-rails/compare/v0.3.7...v0.3.8)
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
|
|
|
- Some associations were missing from the clean-up
- Some attributes were not reset on suspension
- Skip federation and streaming deletes when purging a dead domain
- Move account association definitions to concern
|
|
ThibG/glitch-soc/features/reply-all-streaming-entries
Display a double reply arrow on public pages for toots that are replies
|
|
Merge upstream changes
|
|
|
|
|
|
Fixes #9411
|
|
Merge upstream changes
|
|
|
|
|
|
|
|
* Update + correction
Colomna and not columna
Pòt, verb missing
* Correction
D’aquí is followed by a time period, and dins by a season.
Read : https://github.com/briannesbitt/Carbon/pull/1403 for more details.
* Correction admin zone
* Correction
Reïnicializacion, with the funny ï
|
|
* create a title tooltip explaining what a locked account is
* improve phrasing
* minor phrasing fix to unify default and english
|