aiden
/
mastodon
mirror of https://github.com/mastodon/mastodon
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,395 Commits
139 Branches
281 Tags
1.0 GiB
Commit Graph

6395 Commits (361818e931eff47db937ffa18d89575e2a9dd5be)
 

Author SHA1 Message Date
ysksn 361818e931 Fix Admin::TagsController#unhide ()
ysksn ae3d2f446a Add specs for Admin::InvitesController ()
ThibG 81bda7d67c Add setting to not aggregate reblogs () 
* Add setting to not aggregate reblogs

Fixes 

* 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
Eugen Rochko 6b78e5b5ab
Cache hashtag sample accounts, and exclude ineligible ones ()
Eugen Rochko 4638b16822
Make notification time smaller and reduce contrast ()
Marcin Mikołajczak 6cf12aa74c i18n: Update Polish translation () 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
ysksn dfd123d5b3 Remove pending spec ()
dependabot[bot] 1c7061fb90 Bump rubocop from 0.61.0 to 0.61.1 () 
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>
Paweł Ngei 5c7f641565 Escape HTML in profile name preview in profile settings () 
* 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
ysksn d3547fa005 Add specs for ActivityPub::InboxesController ()
ysksn 88b3eed16f Add specs for Admin::AccountModerationNotesHelper ()
ysksn 57bb62d5cf Remove pending spec () 
Since dots are not allowed in username,
this spec is no longer needed.
ysksn 51cbd045da Add specs for AccountTagStat model ()
Eugen Rochko ecd303c097
Fix various things in the directory () 
* 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
Takeshi Umeda c1c0f7c516 Fix tag mb_chars comparison of profile directory ()
Eugen Rochko 73be8f38c1
Add profile directory () 
Fix
ysksn 155cf12680 Remove pending spec () 
`#from_account` isn't defined.
ysksn e2910dff12 Add spec for Identity.find_for_oauth ()
dependabot[bot] d5245434ec Bump rails from 5.2.1.1 to 5.2.2 () 
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>
dependabot[bot] 781c7be08b Bump rails-controller-testing from 1.0.3 to 1.0.4 () 
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>
dependabot[bot] c73c463478 Bump rubocop from 0.60.0 to 0.61.0 () 
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>
ThibG 1a22eff1e0 Attempt fixing deadlocks by moving account stats update outside transaction () 
* 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
Paweł Ngei 9897cf0701 Add visible dates for notifications in Notification column () 
* add RelativeTimestamp elements

* style the elements properly with CSS
ThibG e88c6a5c3c Fix thread depth computation in statuses_controller () 
* Add test that should currently fail

* Fix depth computation (will still fail if statuses have been filtered out)

* Fix handling of broken threads
dependabot[bot] a61ce1c947 Bump capybara from 3.11.1 to 3.12.0 () 
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>
dependabot[bot] 4ad6bac447 Bump rails-controller-testing from 1.0.2 to 1.0.3 () 
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>
dependabot[bot] 2b657c175f Bump pry-rails from 0.3.7 to 0.3.8 () 
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>
Eugen Rochko 58a29db99d
Add database statement timeout of 60s ()
Eugen Rochko 6ddf0432e7
Improve account suspension speed and completeness () 
- 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
Eugen Rochko 2df5ef18ae
Bump version to 2.6.5 ()
ThibG 84e5ed43e7 Preload common JSON-LD contexts () 
Fixes
ThibG 5648b30d6c Fix last_status parameter for notifications and conversations ()
Quentí 6a285f0a15 [i18n] update and corrections for Occitan locale () 
* 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 ï
Paweł Ngei b9ec34de57 Add a tooltip explaining what a locked account is () 
* create a title tooltip explaining what a locked account is

* improve phrasing

* minor phrasing fix to unify default and english
Eugen Rochko c480da375b
Bump version to 2.6.4 ()
mayaeh bfec030a4e Fix that translation is not applied to "joining hashtags" ()
Eugen Rochko 3948b6fa52
Remove npm-run-all dependency () 
Fix
dependabot[bot] d0453e77dc Bump oj from 3.7.1 to 3.7.4 () 
Bumps [oj](https://github.com/ohler55/oj) from 3.7.1 to 3.7.4.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.7.1...v3.7.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
dependabot[bot] 5866e0b909 Bump fastimage from 2.1.4 to 2.1.5 () 
Bumps [fastimage](https://github.com/sdsykes/fastimage) from 2.1.4 to 2.1.5.
- [Release notes](https://github.com/sdsykes/fastimage/releases)
- [Commits](https://github.com/sdsykes/fastimage/compare/v2.1.4...v2.1.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Eugen Rochko d037e88277
Bump version to 2.6.3 ()
ThibG fa9f28f52d Swap avatar and header input fields in profile page () 
Fixes
dependabot[bot] 6fac300ea4 Bump aws-sdk-s3 from 1.25.0 to 1.27.0 () 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.25.0 to 1.27.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/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
dependabot[bot] 7f68452a15 [Security] Bump rails from 5.2.1 to 5.2.1.1 () 
Bumps [rails](https://github.com/rails/rails) from 5.2.1 to 5.2.1.1. **This update includes security fixes.**
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v5.2.1...v5.2.1.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Eugen Rochko c39d7e7b2b
Fix TLS handshake timeout not being enforced () 
Follow-up to
Eugen Rochko 11955600ad
Skip deliveries to inboxes that have already been marked as unavailable ()
Eugen Rochko 81f96c973a
Don't count suspended users in user count () 
Fix
Eugen Rochko 43c311b3a1
Fix nil error when no DNS addresses are found for host ()
Marcin Mikołajczak cb583ff355 Do not leak existence of e-mail addresses during login attempt, part 2 () 
* Do not leak existence of e-mail addresses during login attempt, part 2

* Update devise.uk.yml
Marcin Mikołajczak 6bdc9866b7 security/l10n [fr] do not leak registered e-mail addresses () 
Do not leak existence of e-mail addresses during login attempt in French translation
Eugen Rochko 637d0ed838
Bump version to 2.6.2 ()