dependabot[bot]
0bc38b0a8a
Bump rack-attack from 6.5.0 to 6.6.0 ( #17405 )
...
* Bump rack-attack from 6.5.0 to 6.6.0
Bumps [rack-attack](https://github.com/rack/rack-attack ) from 6.5.0 to 6.6.0.
- [Release notes](https://github.com/rack/rack-attack/releases )
- [Changelog](https://github.com/rack/rack-attack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rack/rack-attack/compare/v6.5.0...v6.6.0 )
---
updated-dependencies:
- dependency-name: rack-attack
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* Fix usage of deprecated API
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2022-03-12 09:23:53 +01:00
Eugen Rochko
dcbc83c9b3
Fix not updating a status when newer version is fetched manually ( #17745 )
2022-03-12 09:11:36 +01:00
Eugen Rochko
fc3be17919
Fix nil error when trying to fetch key for signature verification ( #17747 )
2022-03-12 09:02:24 +01:00
Claire
503f16a333
Update fix-duplicates maintenance task ( #17731 )
...
* Update fix-duplicates task to 2022_02_10_153119
Also add support for Appeal to AccountMerging#merge_with!
* Update fix-duplicates task to 2022_03_07_094650
* Update fix-duplicates task to 2022_03_09_213005
* Update fix-duplicates task to 2022_03_07_083603
* Update fix-duplicates task to 2022_03_10_060626
* Update fix-duplicates script to 2022_03_07_083603
* Update fix-duplicates task to 2022_03_10_060706
* Update fix-duplicates task to 2022_03_10_060959
* Silence CodeClimate
2022-03-12 08:33:11 +01:00
Eugen Rochko
cd06775130
Fix moderator account leak in status edit history ( #17746 )
2022-03-12 08:23:03 +01:00
Eugen Rochko
02d910cf90
Fix null values being included in some indexes ( #17711 )
...
* Fix null values being included in some indexes
* Update lib/mastodon/migration_helpers.rb
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
* Add documentation link to corruption error message
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2022-03-12 08:12:57 +01:00
Eugen Rochko
1d46b5b263
Fix POST /api/v1/emails/confirmations not being available after sign-up ( #17743 )
2022-03-12 04:14:25 +01:00
Eugen Rochko
6c0080f6bf
New Crowdin updates ( #17674 )
...
* New translations devise.en.yml (Hindi)
* New translations devise.en.yml (Spanish, Mexico)
* New translations devise.en.yml (Spanish, Argentina)
* New translations devise.en.yml (Swedish)
* New translations activerecord.en.yml (Vietnamese)
* New translations activerecord.en.yml (Turkish)
* New translations devise.en.yml (Turkish)
* New translations activerecord.en.yml (Ukrainian)
* New translations devise.en.yml (Ukrainian)
* New translations activerecord.en.yml (Chinese Simplified)
* New translations devise.en.yml (Chinese Simplified)
* New translations activerecord.en.yml (Chinese Traditional)
* New translations devise.en.yml (Chinese Traditional)
* New translations devise.en.yml (Urdu (Pakistan))
* New translations devise.en.yml (Vietnamese)
* New translations activerecord.en.yml (Spanish, Argentina)
* New translations activerecord.en.yml (Galician)
* New translations devise.en.yml (Galician)
* New translations activerecord.en.yml (Portuguese, Brazilian)
* New translations devise.en.yml (Portuguese, Brazilian)
* New translations activerecord.en.yml (Indonesian)
* New translations devise.en.yml (Indonesian)
* New translations activerecord.en.yml (Persian)
* New translations devise.en.yml (Persian)
* New translations activerecord.en.yml (Tamil)
* New translations devise.en.yml (Tamil)
* New translations devise.en.yml (Welsh)
* New translations activerecord.en.yml (Sorani (Kurdish))
* New translations devise.en.yml (Sorani (Kurdish))
* New translations activerecord.en.yml (Corsican)
* New translations devise.en.yml (Corsican)
* New translations activerecord.en.yml (Sardinian)
* New translations devise.en.yml (Sardinian)
* New translations activerecord.en.yml (Kabyle)
* New translations activerecord.en.yml (Kurmanji (Kurdish))
* New translations devise.en.yml (Kabyle)
* New translations devise.en.yml (Ido)
* New translations activerecord.en.yml (Standard Moroccan Tamazight)
* New translations devise.en.yml (Kurmanji (Kurdish))
* New translations devise.en.yml (Serbian (Latin))
* New translations activerecord.en.yml (Esperanto)
* New translations activerecord.en.yml (Breton)
* New translations activerecord.en.yml (Chinese Traditional, Hong Kong)
* New translations devise.en.yml (Chinese Traditional, Hong Kong)
* New translations activerecord.en.yml (Tatar)
* New translations devise.en.yml (Tatar)
* New translations activerecord.en.yml (Malayalam)
* New translations devise.en.yml (Malayalam)
* New translations devise.en.yml (Breton)
* New translations activerecord.en.yml (Serbian (Latin))
* New translations activerecord.en.yml (Sinhala)
* New translations devise.en.yml (Sinhala)
* New translations devise.en.yml (Kannada)
* New translations activerecord.en.yml (Occitan)
* New translations devise.en.yml (Occitan)
* New translations devise.en.yml (Standard Moroccan Tamazight)
* New translations en.yml (Catalan)
* New translations en.json (Norwegian)
* New translations en.yml (Catalan)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Catalan)
* New translations en.json (Slovenian)
* New translations en.json (Persian)
* New translations en.json (Occitan)
* New translations en.json (Arabic)
* New translations en.json (Thai)
* New translations en.json (Hebrew)
* New translations en.json (Greek)
* New translations en.json (Dutch)
* New translations en.json (Romanian)
* New translations en.json (French)
* New translations en.json (Spanish)
* New translations en.json (Bulgarian)
* New translations en.json (Czech)
* New translations en.json (Danish)
* New translations en.json (German)
* New translations en.json (Latvian)
* New translations en.json (Indonesian)
* New translations en.json (Tamil)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Spanish, Mexico)
* New translations en.json (Bengali)
* New translations en.json (Marathi)
* New translations en.json (Croatian)
* New translations en.json (Kazakh)
* New translations en.json (Estonian)
* New translations en.json (Hindi)
* New translations en.json (Icelandic)
* New translations en.json (Malay)
* New translations en.json (Welsh)
* New translations en.json (Esperanto)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Tatar)
* New translations en.json (Malayalam)
* New translations en.json (Breton)
* New translations en.json (Sinhala)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Galician)
* New translations en.json (Basque)
* New translations en.json (Polish)
* New translations en.json (Finnish)
* New translations en.json (Hungarian)
* New translations en.json (Armenian)
* New translations en.json (Italian)
* New translations en.json (Japanese)
* New translations en.json (Korean)
* New translations en.json (Lithuanian)
* New translations en.json (Macedonian)
* New translations en.json (Portuguese)
* New translations en.json (Vietnamese)
* New translations en.json (Russian)
* New translations en.json (Slovak)
* New translations en.json (Albanian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Swedish)
* New translations en.json (Turkish)
* New translations en.json (Ukrainian)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Traditional)
* New translations en.json (Urdu (Pakistan))
* New translations en.json (Cornish)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Asturian)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Corsican)
* New translations en.json (Sardinian)
* New translations en.json (Sanskrit)
* New translations en.json (Kabyle)
* New translations en.json (Standard Moroccan Tamazight)
* New translations en.json (Swedish)
* New translations en.json (Catalan)
* New translations en.json (Polish)
* New translations en.yml (Korean)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.json (Turkish)
* New translations simple_form.en.yml (Korean)
* New translations doorkeeper.en.yml (Korean)
* New translations en.yml (French)
* New translations en.json (Russian)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.json (French)
* New translations en.yml (French)
* New translations en.yml (Hungarian)
* New translations en.json (Hungarian)
* New translations en.yml (French)
* New translations en.yml (Hungarian)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.json (German)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Turkish)
* New translations en.yml (Icelandic)
* New translations en.yml (Turkish)
* New translations en.yml (Icelandic)
* New translations en.json (Icelandic)
* New translations en.yml (Spanish)
* New translations en.yml (Danish)
* New translations en.yml (Chinese Traditional)
* New translations en.json (Spanish)
* New translations en.json (Chinese Traditional)
* New translations en.yml (Spanish)
* New translations en.yml (Chinese Traditional)
* New translations en.json (Indonesian)
* New translations en.yml (Italian)
* New translations en.yml (Danish)
* New translations en.json (Italian)
* New translations en.yml (Danish)
* New translations en.json (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.json (Slovenian)
* New translations en.yml (Portuguese)
* New translations en.yml (Portuguese)
* New translations en.yml (Portuguese)
* New translations en.yml (Portuguese)
* New translations en.yml (Latvian)
* New translations en.json (Portuguese)
* New translations simple_form.en.yml (Portuguese)
* New translations en.yml (Danish)
* New translations en.yml (Portuguese)
* New translations en.yml (Latvian)
* New translations en.json (Portuguese)
* New translations en.json (Latvian)
* New translations en.yml (Danish)
* New translations en.yml (Portuguese)
* New translations en.yml (Latvian)
* New translations en.yml (Danish)
* New translations en.json (Spanish, Argentina)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Spanish, Mexico)
* New translations en.json (Spanish, Mexico)
* New translations en.yml (Russian)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Russian)
* New translations en.yml (Russian)
* New translations en.json (Sinhala)
* New translations en.yml (Sinhala)
* New translations en.json (Greek)
* New translations doorkeeper.en.yml (Sinhala)
* New translations en.yml (Indonesian)
* New translations en.yml (Indonesian)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Japanese)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Turkish)
* New translations en.yml (Vietnamese)
* New translations en.json (Vietnamese)
* New translations en.json (Slovak)
* New translations en.json (Slovak)
* New translations doorkeeper.en.yml (Slovak)
* New translations en.yml (Slovak)
* New translations en.json (Slovak)
* New translations doorkeeper.en.yml (Slovak)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Korean)
* New translations en.yml (Korean)
* New translations en.yml (Korean)
* New translations en.yml (Korean)
* New translations en.json (Korean)
* New translations en.json (Esperanto)
* New translations en.yml (Danish)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
* New translations en.yml (Danish)
* Fix
* Run `bundle exec i18n-tasks normalize -l da`
* New translations en.yml (Danish)
* Run `bundle exec i18n-tasks normalize -l da`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-03-11 14:35:51 +09:00
Jeong Arm
dc95388daf
Enable domain purge button on suspended domains too ( #17741 )
...
Related: #17209
2022-03-11 04:58:09 +01:00
Claire
9d93d4bafe
Fix edit history dropdown and modal in light theme ( #17740 )
...
Fixes #17739
2022-03-10 17:59:23 +01:00
Claire
f07f0a7e59
Merge pull request #1715 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-03-10 17:29:15 +01:00
Claire
643177ff8a
[Glitch] Fix report dialog being illegible using mastodon-light theme
...
Port 040961e3f8
2022-03-10 11:42:54 +01:00
Claire
807b83ce90
Adapt view for glitch-soc's theming system
2022-03-10 11:30:48 +01:00
Eugen Rochko
4d1b09c62a
[Glitch] Add polls and media attachments to edit comparison modal in web UI
...
Port f5346541fd
2022-03-10 11:30:48 +01:00
Claire
57c69a47ab
Move report modal styles to flavours/glitch/styles/components/modal.scss
2022-03-10 11:16:13 +01:00
Eugen Rochko
665ade7fae
[Glitch] Fix being able to add more than 4 hashtags to hashtag column in web UI
...
Port 380aef66ae
2022-03-10 10:15:36 +01:00
Eugen Rochko
99feb19348
[Glitch] Change design of federation pages in admin UI
...
Port front-end changes from 040961e3f8
2022-03-10 10:14:33 +01:00
Claire
f677c1619a
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/status.rb`:
Upstream updated media and edit-related code textually close to glitch-soc
additions (local-only and content-type).
Ported upstream changes.
- `app/models/status_edit.rb`:
Upstream changes textually close to glitch-soc additions (content-type).
Ported upstream changes.
- `app/serializers/activitypub/note_serializer.rb`:
Upstream changed how media attachments are handled. Not really a conflict,
but textually close to glitch-soc additions (directMessage attribute).
Ported upstream changes.
- `app/services/remove_status_service.rb`:
Upstream changed how media attachments are handled. Not really a conflict,
but textually close to glitch-soc additions (DM timeline).
Ported upstream changes.
- `app/services/update_status_service.rb`:
Upstream fixed an issue with language selection. Not really a conflict,
but textually close to glitch-soc additions (content-type).
Ported upstream changes.
- `db/schema.rb`:
Upstream added columns to the `status_edits` table, the conflict is because
of an additional column (`content-type`) in glitch-soc.
Ported upstream changes.
- `package.json`:
Upstream dependency (express) textually adjacent to a glitch-soc-specific one
(favico.js) got updated.
Updated it as well.
2022-03-10 09:52:45 +01:00
Takeshi Umeda
03d5bdae36
Fix a type error in domain_block policies ( #17735 )
2022-03-10 04:10:20 +01:00
Claire
c49a7369dd
Add test for reblog race condition fix ( #17732 )
...
Follow-up to #17693
2022-03-10 00:11:49 +01:00
Claire
f677ac5fb8
Add tests for CVE-2022-24307 ( #17733 )
...
Follow-up to #17426
2022-03-10 00:11:40 +01:00
Claire
040961e3f8
Fix report dialog being illegible using mastodon-light theme ( #17734 )
...
Fixes #17726
2022-03-10 00:11:15 +01:00
Claire
1e56b2f650
Fix existing boosts possibly referencing deleted toots ( #17730 )
...
Follow-up to #17693
2022-03-09 22:44:37 +01:00
Eugen Rochko
f5346541fd
Add polls and media attachments to edit comparison modal in web UI ( #17727 )
2022-03-09 21:15:24 +01:00
Claire
0d6bec52a8
Fix rare race condition when rebloged status is deleted ( #17693 )
...
* Fix rare race condition when rebloged status is deleted
* Use INSERT INTO … SELECT
2022-03-09 20:49:14 +01:00
Eugen Rochko
a96ba18fd9
Add rate limit for editing ( #17728 )
2022-03-09 20:06:51 +01:00
dependabot[bot]
5b67e8c005
Bump express from 4.17.2 to 4.17.3 ( #17609 )
...
Bumps [express](https://github.com/expressjs/express ) from 4.17.2 to 4.17.3.
- [Release notes](https://github.com/expressjs/express/releases )
- [Changelog](https://github.com/expressjs/express/blob/master/History.md )
- [Commits](https://github.com/expressjs/express/compare/4.17.2...4.17.3 )
---
updated-dependencies:
- dependency-name: express
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-09 21:36:40 +09:00
dependabot[bot]
028f0ba59a
Bump blurhash from 1.1.4 to 1.1.5 ( #17610 )
...
Bumps [blurhash](https://github.com/woltapp/blurhash ) from 1.1.4 to 1.1.5.
- [Release notes](https://github.com/woltapp/blurhash/releases )
- [Commits](https://github.com/woltapp/blurhash/commits )
---
updated-dependencies:
- dependency-name: blurhash
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-09 21:36:02 +09:00
dependabot[bot]
43fc916567
Bump capistrano-rails from 1.6.1 to 1.6.2 ( #17603 )
...
Bumps [capistrano-rails](https://github.com/capistrano/rails ) from 1.6.1 to 1.6.2.
- [Release notes](https://github.com/capistrano/rails/releases )
- [Commits](https://github.com/capistrano/rails/compare/v1.6.1...v1.6.2 )
---
updated-dependencies:
- dependency-name: capistrano-rails
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-09 21:34:59 +09:00
dependabot[bot]
1bb4d08b9d
Bump marky from 1.2.2 to 1.2.4 ( #17606 )
...
Bumps [marky](https://github.com/nolanlawson/marky ) from 1.2.2 to 1.2.4.
- [Release notes](https://github.com/nolanlawson/marky/releases )
- [Commits](https://github.com/nolanlawson/marky/compare/v1.2.2...v1.2.4 )
---
updated-dependencies:
- dependency-name: marky
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-09 21:33:49 +09:00
dependabot[bot]
f9665f6618
Bump @testing-library/react from 12.1.2 to 12.1.3 ( #17605 )
...
Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library ) from 12.1.2 to 12.1.3.
- [Release notes](https://github.com/testing-library/react-testing-library/releases )
- [Changelog](https://github.com/testing-library/react-testing-library/blob/main/CHANGELOG.md )
- [Commits](https://github.com/testing-library/react-testing-library/compare/v12.1.2...v12.1.3 )
---
updated-dependencies:
- dependency-name: "@testing-library/react"
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-09 21:33:19 +09:00
dependabot[bot]
1153ea338c
Bump stackprof from 0.2.17 to 0.2.19 ( #17644 )
...
Bumps [stackprof](https://github.com/tmm1/stackprof ) from 0.2.17 to 0.2.19.
- [Release notes](https://github.com/tmm1/stackprof/releases )
- [Changelog](https://github.com/tmm1/stackprof/blob/master/CHANGELOG.md )
- [Commits](https://github.com/tmm1/stackprof/compare/v0.2.17...v0.2.19 )
---
updated-dependencies:
- dependency-name: stackprof
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-09 21:32:28 +09:00
dependabot[bot]
b3af6619ac
Bump @babel/core from 7.17.2 to 7.17.5 ( #17607 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.17.2 to 7.17.5.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.17.5/packages/babel-core )
---
updated-dependencies:
- dependency-name: "@babel/core"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-09 21:32:12 +09:00
dependabot[bot]
1ffc873b41
Bump redis-namespace from 1.8.1 to 1.8.2 ( #17715 )
...
Bumps [redis-namespace](https://github.com/resque/redis-namespace ) from 1.8.1 to 1.8.2.
- [Release notes](https://github.com/resque/redis-namespace/releases )
- [Changelog](https://github.com/resque/redis-namespace/blob/master/CHANGELOG.md )
- [Commits](https://github.com/resque/redis-namespace/compare/v1.8.1...v1.8.2 )
---
updated-dependencies:
- dependency-name: redis-namespace
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-09 21:31:27 +09:00
dependabot[bot]
e01af6f018
Bump faker from 2.19.0 to 2.20.0 ( #17716 )
...
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.19.0 to 2.20.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.19.0...v2.20.0 )
---
updated-dependencies:
- dependency-name: faker
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-09 21:30:35 +09:00
dependabot[bot]
edb55dfd6d
Bump eslint-plugin-react from 7.29.2 to 7.29.3 ( #17717 )
...
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react ) from 7.29.2 to 7.29.3.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases )
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md )
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.29.2...v7.29.3 )
---
updated-dependencies:
- dependency-name: eslint-plugin-react
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-09 21:17:58 +09:00
Eugen Rochko
380aef66ae
Fix being able to add more than 4 hashtags to hashtag column in web UI ( #17729 )
2022-03-09 13:01:44 +01:00
Eugen Rochko
594c595fa5
Chore: Update translatable strings ( #17723 )
2022-03-09 20:45:49 +09:00
Claire
c8f4894518
Change text version of warning mail to mention appeals instead of mails ( #17725 )
...
Also, the instruction to reply to e-mail would probably not work in many cases
where the notifications e-mail address is not able to receive incoming emails
or the mailbox is not actively monitored.
2022-03-09 12:11:11 +01:00
chandrn7
ce5bebf108
Allow login through OpenID Connect ( #16221 )
...
* added OpenID Connect as an SSO option
* minor fixes
* added comments, removed an option that shouldn't be set
* fixed Gemfile.lock
* added newline to end of Gemfile.lock
* removed tab from Gemfile.lock
* remove chomp
* codeclimate changes and small name change to make function's purpose clearer
* codeclimate fix
* added SSO buttons to /about page
* minor refactor
* minor style change
* removed spurious change
* removed unecessary conditional from ensure_valid_username and added support for auth.info.name in user_params_from_auth
* minor changes
2022-03-09 12:07:35 +01:00
Eugen Rochko
9c2275d15f
Change how changes to media attachments are stored for edits ( #17696 )
...
* Change how changes to media attachments are stored for edits
Fix not being able to re-order media attachments
* Fix not broadcasting updates when polls/media is changed through ActivityPub
* Various fixes and improvements
* Update app/models/report.rb
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
* Add tracking of media attachment description changes
* Change poll in status edit to have a structure closer to the real one
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2022-03-09 09:06:17 +01:00
Eugen Rochko
11e848bf95
Change design of federation pages in admin UI ( #17704 )
...
* Change design of federation pages in admin UI
* Fix query performance in instance media attachments measure
* Fix reblogs being included in instance languages dimension
2022-03-09 08:52:32 +01:00
Eugen Rochko
9dc45798f9
Fix data integrity of featured tags ( #17712 )
2022-03-09 08:51:12 +01:00
Eugen Rochko
aff497a87a
Fix invalid language resulting in no fallback being set on statuses ( #17722 )
2022-03-09 08:46:05 +01:00
Claire
042fdae3b5
Merge pull request #1713 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-03-08 22:40:21 +01:00
Eugen Rochko
4623292d97
[Glitch] Change appearance of account cards in web UI
...
Port 563964dd80
2022-03-08 20:52:49 +01:00
Josh Soref
beb59e188e
[Glitch] Spelling
...
Port front-end changes from 1c070bd94c
2022-03-08 20:36:31 +01:00
Claire
09306d7c3c
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/settings/preferences_controller.rb`:
Conflicts due to us having more user settings and upstream dropping
`hide_network` (to replace it with an account attribute, properly migrated).
Dropped `hide_network` like upstream.
- `app/lib/user_settings_decorator.rb`:
Conflicts due to us having more user settings and upstream dropping
`hide_network` (to replace it with an account attribute, properly migrated).
Dropped `hide_network` like upstream.
- `app/models/status.rb`:
Conflict because of slight change in how glitch-soc handles the scope to
filter out local-only posts for anonymous viewers.
Took upstream's changes and re-applied glitch-soc's change.
- `app/models/user.rb`:
Conflicts due to us having more user settings and upstream dropping
`hide_network` (to replace it with an account attribute, properly migrated).
Dropped `hide_network` like upstream.
- `app/views/directories/index.html.haml`:
Conflict because upstream redesigned that page while glitch-soc had a minor
change to support hiding the number of followers.
Ported glitch-soc's change on top of upstream's redesign.
Additional changes:
- `app/models/account_statuses_filter.rb`:
See change to `app/models/status.rb`.
2022-03-08 20:22:54 +01:00
Eugen Rochko
d5de12d931
Fix performance of account timelines ( #17709 )
...
* Fix performance of account timelines
* Various fixes and improvements
* Fix duplicate results being returned
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
* Fix grouping for pinned statuses scope
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2022-03-08 09:14:39 +01:00
Claire
e8db3d38cf
Add more migration tests ( #17710 )
...
* Add migration tests for hide_network settings migration
* Add tests about suspended/suspended_at
* Add more tests regarding the results of migrations
* Fix migration test regarding stale conflicting remote account
* Add migration tests about AccountConversation
2022-03-07 23:40:55 +01:00
