8d05167e5f
Include config/ and update all rubcop deps ( #23963 )
2023-03-17 10:13:28 +01:00
e7c5ccafca
Link to the Identity provider's account settings from the account settings ( #24100 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-03-17 10:09:01 +01:00
bb60db4471
[Glitch] Replace `Status#translatable?` with language matrix in separate endpoint
...
Port 7583523bf0
2023-03-16 23:21:08 +01:00
488cd37f1a
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream changed their README, we have our own.
Kept ours.
- `app/helpers/application_helper.rb`:
Minor code style fix upstream, on a line that is different in glitch-soc
due to the different theming system.
Applied the code style fix to our own code.
- `app/views/settings/preferences/appearance/show.html.haml`:
Code style fix on a line next to lines exclusive to glitch-soc.
Applied upstream changes.
- `yarn.lock`:
Upstream updated a dependency textually close to a glitch-soc-only
dependency.
Updated the dependency like upstream did.
2023-03-16 23:12:59 +01:00
3b17f2f718
Add warning for object storage misconfiguration ( #24137 )
2023-03-16 22:47:01 +01:00
ef0c6a43ed
Change user backups to use expiring URLs for download when possible ( #24136 )
2023-03-16 22:46:52 +01:00
83f302c101
New Crowdin updates ( #23904 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-03-16 21:02:00 +09:00
7583523bf0
Replace `Status#translatable?` with language matrix in separate endpoint ( #24037 )
2023-03-16 11:07:24 +01:00
f0734513f4
Refactor monkey-patching of `PrivateAddressCheck` ( #24122 )
2023-03-16 04:33:38 +01:00
0717d1b058
Autofix Rubocop Style/RedundantArgument ( #23798 )
2023-03-16 10:34:00 +09:00
994cb73f56
Fix more haml-lint Rubocop ( #24107 )
2023-03-15 20:07:43 +01:00
20af3cc038
[Glitch] Center the text itself in upload area
...
Port 100ada1e2b
2023-03-15 09:33:48 +01:00
08685405f1
[Glitch] add modal message when editing toot
...
Port c4c1c8aecc
2023-03-15 09:33:14 +01:00
f39d9ab256
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream switched to pushing to both DockerHub and GitHub Container
Repository, while glitch-soc was already pushing to the latter only.
Updated our configuration to be slightly more consistent with upstream's
naming and styling, but kept our behavior.
- `Gemfile.lock`:
Updated dependencies textually too close to glitch-soc only hcaptcha
dependency.
Updated dependencies as upstream did.
- `README.md`:
Upstream updated its README, but we have a completely different one.
Kept our README, though it probably should be reworked at some point.
- `app/views/auth/sessions/two_factor.html.haml`:
Minor style fix upstream that's on a line glitch-soc removed because
of its different theming system.
Kept our file as is.
- `spec/controllers/health_controller_spec.rb`:
This file apparently did not exist upstream, upstream created it with
different contents but it is functionally the same.
Switched to upstream's version of the file.
- `spec/presenters/instance_presenter_spec.rb`:
Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc
had its own code because it's a fork and does not have the same default
source URL.
Took upstream's change, but with glitch-soc's repo as the default case.
- `yarn.lock`:
Upstream dependencies textually too close to a glitch-soc only one.
Updated dependencies as upstream did.
2023-03-15 09:16:10 +01:00
30328759da
Setup haml-lint CI with todo config ( #23524 )
2023-03-15 04:15:36 +01:00
8a618c8eca
Fix misleading error code when receiving invalid WebAuthn credentials ( #23568 )
2023-03-15 04:15:20 +01:00
5f11a64dbc
Fix incorrect post links in strikes when the account is remote ( #23611 )
2023-03-15 04:14:47 +01:00
bde1c7aa96
Fix dashboard crash on ElasticSearch server error ( #23751 )
2023-03-15 04:01:49 +01:00
cfc04637b5
Redirect users to SLO at the IdP after logging them out of Mastodon. ( #24020 )
2023-03-15 03:52:40 +01:00
23bce96f0c
Change sidekiq-bulk's batch size from 10,000 to 1,000 jobs in one Redis call ( #24034 )
2023-03-15 03:45:15 +01:00
5f9f43d051
Prefer the stored location as after_sign_in_path in Omniauth Callback Controller ( #24073 )
2023-03-13 00:06:27 +01:00
100ada1e2b
Center the text itself in upload area ( #24029 )
2023-03-09 14:35:44 +01:00
170d3a0bc8
Unescape HTML entities ( #24019 )
2023-03-08 19:56:41 +01:00
8ea6707b2b
Remove unused TOCGenerator ( #23986 )
2023-03-06 17:33:58 +01:00
c4c1c8aecc
add modal message when editing toot ( #23936 )
...
Co-authored-by: PauloVilarinho <paulotarsobranco@hotmail.com>
2023-03-06 17:33:09 +01:00
aadb1317a5
Remove sidebar dead code ( #23984 )
2023-03-06 16:25:35 +01:00
980472efc8
Fix unconfirmed accounts being registered as active users ( #23803 )
2023-03-06 16:00:08 +01:00
e7e90a5e63
Do not strip tags from `Setting.site_short_description` ( #23975 )
2023-03-06 15:37:19 +01:00
5f94d33a67
Refactor glitch-soc rich text SCSS
2023-03-05 21:31:45 +01:00
a813ea3c25
[Glitch] Only offer translation for supported languages
...
Port cc0c37cd69
2023-03-05 21:19:04 +01:00
81aac88f65
[Glitch] Switched bookmark and favourites around
...
Port f5fe444913
2023-03-05 21:07:55 +01:00
05763031f1
[Glitch] Fix duplicate “Publish” button on mobile
...
Port 3faa229d8d
2023-03-05 21:07:10 +01:00
a6363c3a2a
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream README has been changed, but we have a completely different one.
Kept our `README.md`.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added support for more incoming HTML tags (a large subset of what
glitch-soc accepts).
Change the code style to match upstream's but otherwise do not change our
code.
- `spec/lib/sanitize_config_spec.rb`:
Upstream added support for more incoming HTML tags (a large subset of what
glitch-soc accepts).
Kept our version, since the tests are mostly glitch-soc's, except for cases
which are purposefuly different.
2023-03-05 20:46:56 +01:00
f7a679a4f5
New Crowdin updates ( #2118 )
...
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
2023-03-05 20:38:18 +01:00
b50a08b15b
[Glitch] Add `lang` attribute to media and poll options
...
Port 41655e16ea
2023-03-05 17:52:53 +01:00
f731ba595b
Enable Rubocop for app/views ( #23874 )
2023-03-05 00:33:52 +01:00
50b76430b4
Do not leave Mastodon when clicking “Back” ( #23953 )
2023-03-04 23:18:19 +01:00
471346fd3a
User mailer spec coverage improvements ( #23905 )
2023-03-04 17:16:11 +01:00
c48dd42fa8
Misc coverage improvements for validators ( #23928 )
2023-03-04 17:00:00 +01:00
08c2938b4a
Upgrade to latest redis-rb 4.x and fix deprecations ( #23616 )
...
Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
2023-03-04 16:38:28 +01:00
24b0410744
Remove implied StandardError rescue ( #23942 )
2023-03-03 22:49:16 +01:00
fe098d35c2
Fix original account being unfollowed on migration before the follow request could be sent ( #21957 )
2023-03-03 21:13:55 +01:00
8f79c53cd6
Change `ActivityPub::DeliveryWorker` retries to be spread out more ( #21956 )
2023-03-03 21:08:22 +01:00
cc0c37cd69
Only offer translation for supported languages ( #23879 )
2023-03-03 21:06:31 +01:00
5acc02793a
Fix external authentication not running onboarding code for new users ( #23458 )
2023-03-03 20:45:55 +01:00
db0bbe5cb7
Add mail headers to avoid auto-replies ( #23597 )
2023-03-03 20:44:46 +01:00
05ef604007
Fix error when displaying post history of a trendable post in the admin interface ( #23574 )
2023-03-03 20:44:02 +01:00
f5fe444913
Switched bookmark and favourites around ( #23701 )
2023-03-03 20:37:49 +01:00
6943192f5e
Fix server error when failing to follow back followers from `/relationships` ( #23787 )
2023-03-03 20:36:18 +01:00
3faa229d8d
Fix duplicate “Publish” button on mobile ( #23804 )
2023-03-03 20:25:36 +01:00
7bc43c91a0
Fix “Remove all followers from the selected domains” being more destructive than it claims ( #23805 )
2023-03-03 20:25:15 +01:00
16c8144b1c
Add support for incoming rich text ( #23913 )
2023-03-03 20:19:29 +01:00
a95dc48e01
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-02 17:32:38 +01:00
35cbd0685d
Fix deprecation warning about merging conditions ( #23618 )
2023-03-02 16:21:04 +01:00
5bf8f34842
Spec coverage for HomeHelper ( #23907 )
2023-03-02 10:04:14 +01:00
096f622340
New Crowdin updates ( #23802 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-28 23:01:05 +09:00
19be243493
Autofix Rubocop Style/HashConversion ( #23852 )
2023-02-28 22:59:19 +09:00
9cf4671ba1
Remove unused admin/announcements helper ( #23899 )
2023-02-28 11:56:50 +01:00
1d248c3f57
Remove unused InstancePresenter#sample_accounts method ( #23900 )
2023-02-27 19:03:35 +01:00
385ae6681d
Fix single-record invalid condition on PollVote ( #23810 )
2023-02-27 09:31:15 +01:00
41655e16ea
Add `lang` attribute to media and poll options ( #23891 )
2023-02-26 20:13:27 +01:00
42f73a411c
Move misc rules from components/index.scss to components/misc.scss
2023-02-25 23:47:21 +01:00
59b7c6e3d8
Fix glitch-soc SCSS code style and refactor closer to upstream
2023-02-25 23:46:23 +01:00
5eaad2ae5b
[Glitch] Add `lang` attribute to preview card
...
Port e56145661c
2023-02-25 14:43:57 +01:00
650ea1316a
[Glitch] Increase contrast of upload progress background
...
Port 808c9a7cf4
2023-02-25 14:43:24 +01:00
213b82d0a4
[Glitch] Fix sidebar cut-off on small screens in admin UI
...
Port 1f844d0d18
2023-02-25 14:40:29 +01:00
5548b2c73f
[Glitch] Add `lang` tag to native language names in language picker
...
Port 82c464d4d0
2023-02-25 14:37:05 +01:00
295d193e7f
[Glitch] Rename JSX files with proper `.jsx` extension
...
Port ae3812d182
2023-02-25 14:35:31 +01:00
f3cd30942c
Fix building vanilla flavor after JSX change
2023-02-25 14:28:59 +01:00
f15ded319f
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.prettierignore`:
Upstream added a line at the end of the file, while glitch-soc had its own
extra lines.
Took upstream's change.
- `CONTRIBUTING.md`:
We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes.
Ported upstream changes.
- `app/controllers/application_controller.rb`:
Upstream made code style changes in a method that is entirely replaced
in glitch-soc.
Ignored the change.
- `app/models/account.rb`:
Code style changes textually close to glitch-soc-specific changes.
Ported upstream changes.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream code style changes.
Ignored them.
2023-02-25 14:00:40 +01:00
c759d6f31d
Remove unused HTML Validator ( #23866 )
2023-02-24 20:06:32 +01:00
e56145661c
Add `lang` attribute to preview card ( #23869 )
2023-02-24 20:04:38 +01:00
bc4837a600
Change auto-deletion throttling constants to better scale with server size ( #23320 )
2023-02-23 16:52:40 +01:00
808c9a7cf4
Increase contrast of upload progress background ( #23836 )
2023-02-23 12:58:42 +01:00
6bfb54dccc
New Crowdin updates ( #23625 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-22 21:16:02 +09:00
0fb32f919f
Fix inefficiency when searching accounts per username in admin interface ( #23801 )
2023-02-22 11:53:13 +01:00
4f6ad6475e
Autofix Rubocop Rails/Blank ( #23765 )
2023-02-22 09:57:56 +09:00
247bf6e812
Enable Rubocop Style/StringConcatenation defaults ( #23792 )
2023-02-22 09:54:36 +09:00
1f844d0d18
Fix sidebar cut-off on small screens in admin UI ( #23764 )
2023-02-21 10:06:13 +01:00
82c464d4d0
Add `lang` tag to native language names in language picker ( #23749 )
2023-02-21 09:23:39 +01:00
a0e4d69c12
Autofix Rubocop Rails/FindById ( #23762 )
2023-02-21 10:21:48 +09:00
eed0829d3f
Autofix Rubocop Rails/WhereEquals ( #23759 )
2023-02-21 03:20:56 +09:00
b5b0bc17e8
Change compose form checkbox to native input with `appearance: none` ( #22949 )
2023-02-20 11:32:27 +01:00
dd63a919f0
Autofix Rubocop Style/RescueStandardError ( #23745 )
2023-02-20 11:01:20 +01:00
2dbe2b56aa
Make larger part of status clickable ( #23621 )
2023-02-20 08:11:23 +01:00
9b3be79cb5
Autofix Rubocop Style/FormatString ( #23743 )
2023-02-20 07:58:33 +01:00
e6312104c7
Autofix Rubocop remaining Layout rules ( #23679 )
2023-02-20 06:58:28 +01:00
c08d9e5e5c
Autofix Rubocop Style/UnpackFirst ( #23741 )
2023-02-20 06:51:43 +01:00
ac56c3971b
Autofix Rubocop RSpec/ImplicitSubject ( #23721 )
2023-02-20 05:00:48 +01:00
448f0929a7
Autofix Rubocop Rails/EnumHash ( #23737 )
2023-02-20 05:00:36 +01:00
ae3812d182
Rename JSX files with proper `.jsx` extension ( #23733 )
2023-02-20 03:20:59 +01:00
06f8de2e34
Autofix Rubocop Style/ExplicitBlockArgument ( #23704 )
2023-02-20 11:18:08 +09:00
ae51248ffe
Enable Rubocop HTTP status rules ( #23717 )
2023-02-20 11:16:40 +09:00
b8f17330ea
Autofix Rubocop Rails/Pluck ( #23730 )
2023-02-20 02:28:40 +01:00
483fabc53f
Autofix Rubocop Rails/RedundantForeignKey ( #23731 )
2023-02-20 02:19:40 +01:00
e38fe38604
Fix incorrect translation string in glitch-soc captcha feature
2023-02-19 11:02:27 +01:00
01654e8830
[Glitch] Fix focus point of already-attached media not saving after edit
...
Port 6ce20a89f5
2023-02-19 10:54:04 +01:00
eb3d03a52a
[Glitch] Fix bad type for spellCheck attribute
...
Port 2c8bb9a76a
2023-02-19 10:53:44 +01:00
0bf3bbf662
[Glitch] Enable ESLint Promise plugin defaults
...
Port a80ff32d9a
2023-02-19 10:53:18 +01:00
63992c6900
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Upstream made changes while we have dropped this file.
Keep the file deleted.
- `.prettierignore`:
Upstream made changes at the end of the file, where we
had our extra lines.
Just moved our extra lines back at the end.
- `app/serializers/initial_state_serializer.rb`:
Upstream code style changes.
Applied them.
- `app/services/backup_service.rb`:
Upstream code style changes.
Applied them.
2023-02-19 10:42:55 +01:00
6ce20a89f5
Fix focus point of already-attached media not saving after edit ( #23566 )
2023-02-19 07:11:18 +01:00
be1ec56c6d
Autofix Rubocop Style/StringLiterals ( #23695 )
2023-02-19 07:38:14 +09:00
49f1168050
Autofix Rubocop Style/RedundantBegin ( #23703 )
2023-02-19 07:09:40 +09:00
efe3fb00c7
Merge pull request #2112 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-02-18 22:05:11 +01:00
b0e7d10f63
[Glitch] Upgrade to Stylelint 15 with Prettier
...
Port 6417e06194
2023-02-18 16:02:12 +01:00
a0bef6bdb6
[Glitch] Enable ESLint no-useless-escape
...
Port 1c2ca9557f
2023-02-18 16:02:12 +01:00
70984c6f65
[Glitch] Enable ESLint import recommended rules
...
Port 2663b421be
2023-02-18 16:02:12 +01:00
7f8439ee07
Autofix Rubocop Style/TrailingCommaInArguments ( #23694 )
2023-02-18 12:39:58 +01:00
3f9d7419d1
Autofix Rubocop Style/Lambda ( #23696 )
2023-02-18 12:39:00 +01:00
793f8c7dd5
Autofix Rubocop Style/IfUnlessModifier ( #23697 )
2023-02-18 12:37:47 +01:00
623b6543b2
New Crowdin updates ( #2111 )
...
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* Fix root key name in pt-PT translation file
* Fix normalization issue with ES translation
* Fix issue with `no` locale in glitch-soc
2023-02-18 11:16:30 +01:00
4553bc78ba
Autofix Rubocop Style/PerlBackrefs ( #23649 )
2023-02-18 14:20:20 +09:00
b7d4391c4d
Autofix Rubocop Lint/AmbiguousOperatorPrecedence ( #23681 )
2023-02-18 04:30:23 +01:00
5973a58281
Enable Lint/RedundantCopDisableDirective ( #23687 )
2023-02-18 04:30:14 +01:00
a71a0802d6
Autofix Rubocop Lint/SymbolConversion ( #23683 )
2023-02-18 03:23:49 +01:00
31ca76fe2c
Run rubocop formatting except line length ( #23632 )
2023-02-18 06:56:20 +09:00
2c8bb9a76a
Fix bad type for spellCheck attribute ( #23638 )
2023-02-17 09:51:27 +01:00
a80ff32d9a
Enable ESLint Promise plugin defaults ( #22229 )
2023-02-16 15:30:56 +09:00
4ed26b106c
New Crowdin updates ( #23527 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-16 10:23:03 +09:00
edc6f486bf
Upgrade to Ruby 3.2 ( #22928 )
...
Co-authored-by: Matthew Ford <matt@bitzesty.com>
2023-02-15 08:30:27 +01:00
d706570d30
Add `memorial` attribute to REST API ( #23591 )
2023-02-14 13:50:55 +01:00
6c64af449c
[Glitch] Fix case-sensitive check for previously used hashtags
...
Port 28bc6265bf
2023-02-13 20:05:36 +01:00
b525ce4bf9
[Glitch] Fix attached media uploads not being cleared when replying to a post
...
Port 3c1e48d304
2023-02-13 20:04:45 +01:00
92d1e05c3e
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.prettierignore`:
Upstream added a line at the end, glitch-soc had extra entries at the end.
Added upstream's new line before glitch-soc's.
- `Gemfile.lock`:
Upstream updated dependencies while glitch-soc has an extra one (hcaptcha).
Updated dependencies like upstream did.
- `app/controllers/api/v1/statuses_controller.rb`:
Not a real conflict, upstream added a parameter (`allowed_mentions`) where
glitch-soc already had an extra one (`content_type`).
Added upstream's new parameter.
- `app/javascript/styles/fonts/roboto-mono.scss`:
A lot of lines were changed upstream due to code style changes, and a lot
of those lines had path changes to accomodate glitch-soc's theming system.
Applied upstream's style changes.
- `app/javascript/styles/fonts/roboto.scss`:
A lot of lines were changed upstream due to code style changes, and a lot
of those lines had path changes to accomodate glitch-soc's theming system.
Applied upstream's style changes.
2023-02-13 19:35:35 +01:00
0ae0740826
Add API parameter to safeguard unexpect mentions in new posts ( #18350 )
2023-02-13 16:36:29 +01:00
2663b421be
Enable ESLint import recommended rules ( #23315 )
2023-02-13 15:12:31 +01:00
1c2ca9557f
Enable ESLint no-useless-escape ( #23311 )
2023-02-13 15:12:14 +01:00
28bc6265bf
Fix case-sensitive check for previously used hashtags ( #23526 )
2023-02-13 14:54:08 +01:00
c2cb5defb0
Change followed_by link to location=all if account is local on /admin/accounts/:id page ( #23467 )
2023-02-13 14:39:00 +01:00
6417e06194
Upgrade to Stylelint 15 with Prettier ( #23558 )
2023-02-13 04:57:03 +01:00
ab546780eb
fix hashtag ordering ( #2107 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-02-12 18:58:02 +01:00
84c2fdb503
New Crowdin updates ( #2100 )
...
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
2023-02-12 18:16:08 +01:00
6917c854d1
Merge branch 'main' into glitch-soc/merge-upstream
2023-02-10 22:49:59 +01:00
ea4cffac37
Fix unbounded recursion in post discovery ( #23506 )
...
* Add a limit to how many posts can get fetched as a result of a single request
* Add tests
* Always pass `request_id` when processing `Announce` activities
---------
Co-authored-by: nametoolong <nametoolong@users.noreply.github.com>
2023-02-10 22:16:37 +01:00
3c1e48d304
Fix attached media uploads not being cleared when replying to a post ( #23504 )
2023-02-10 22:03:35 +01:00
b21f5906b9
New Crowdin updates ( #23413 )
...
* New translations en.json (Esperanto)
* New translations en.yml (Slovak)
* New translations en.json (Burmese)
* New translations en.yml (Korean)
* New translations en.json (Burmese)
* New translations en.json (Burmese)
* New translations en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations en.json (Burmese)
* New translations en.yml (Burmese)
* New translations en.yml (Burmese)
* New translations en.json (Burmese)
* New translations activerecord.en.yml (Burmese)
* New translations en.yml (Burmese)
* New translations activerecord.en.yml (Burmese)
* New translations en.json (German)
* New translations simple_form.en.yml (German)
* New translations en.json (Catalan)
* New translations en.yml (Burmese)
* New translations en.yml (Burmese)
* New translations en.yml (Russian)
* New translations doorkeeper.en.yml (Russian)
* New translations simple_form.en.yml (Russian)
* New translations en.json (Russian)
* New translations en.json (Belarusian)
* New translations en.json (Belarusian)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations doorkeeper.en.yml (Korean)
* New translations en.json (Burmese)
* New translations en.yml (Slovak)
* New translations en.yml (Belarusian)
* New translations simple_form.en.yml (Belarusian)
* New translations simple_form.en.yml (Esperanto)
* New translations doorkeeper.en.yml (Esperanto)
* New translations activerecord.en.yml (Esperanto)
* New translations devise.en.yml (Esperanto)
* New translations en.yml (English, United Kingdom)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Asturian)
* New translations en.yml (Asturian)
* New translations doorkeeper.en.yml (Asturian)
* New translations en.json (Asturian)
* New translations en.yml (Asturian)
* New translations en.json (Asturian)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations devise.en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations en.json (Welsh)
* New translations en.yml (Welsh)
* New translations simple_form.en.yml (Welsh)
* New translations activerecord.en.yml (Welsh)
* New translations devise.en.yml (Welsh)
* New translations doorkeeper.en.yml (Welsh)
* New translations en.yml (Burmese)
* New translations en.yml (Burmese)
* New translations en.yml (Burmese)
* New translations en.json (Silesian)
* New translations en.yml (Occitan)
* New translations en.yml (Turkish)
* New translations simple_form.en.yml (Turkish)
* New translations en.json (Occitan)
* New translations activerecord.en.yml (Turkish)
* New translations doorkeeper.en.yml (Turkish)
* Normalize
* Remove unused locales
---------
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-11 05:42:08 +09:00
fce6c27f41
Merge branch 'main' into glitch-soc/merge-upstream
2023-02-10 13:48:21 +01:00
1a094b002d
Fix admin-set follow recommandations being case-sensitive ( #23500 )
...
Fixes #23472
2023-02-10 11:14:58 +01:00
cdcf981ad7
Fix server status URL being a required server setting ( #23499 )
2023-02-10 10:20:43 +01:00
f925f5bf2f
[Glitch] Add scrolling to Compare history modal
...
Port 7406c66b77
2023-02-09 13:03:41 +01:00
54e6fa1363
[Glitch] Show spinner while loading follow requests
...
Port 059a055e65
2023-02-09 13:02:32 +01:00
71629f6f99
[Glitch] Spell check input fields
...
Port 9b74ffa7e0
2023-02-09 12:59:48 +01:00
664847db15
[Glitch] Add setting for status page URL
...
Port 92e5feb621
2023-02-09 12:58:11 +01:00
5f26e6e7ca
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Minor upstream change, our README is completely different.
Kept ours.
- `lib/tasks/assets.rake`:
glitch-soc has extra code to deal with its theming system,
upstream changed a line that exists in glitch-soc.
Applied upstream changes.
2023-02-09 12:46:12 +01:00
1c08aef482
Remove posts count and last posts from ActivityPub representation of hashtag collections ( #23460 )
2023-02-08 17:57:25 +01:00
ae45c9ccd4
Apply Rubocop Rails/WhereNot ( #23448 )
...
* Apply Rubocop Rails/WhereNot
* Update spec for where.not
2023-02-08 10:39:57 +01:00
4a49c50e64
Apply Rubocop Performance/BlockGivenWithExplicitBlock ( #23441 )
...
* Apply Rubocop Performance/BlockGivenWithExplicitBlock
* Unprefix used block parameter
2023-02-08 10:36:23 +01:00
d09952cf77
Apply Rubocop Style/EmptyElse ( #23449 )
2023-02-08 07:08:39 +01:00
e0a02f8696
Apply Rubocop Style/NegatedIfElseCondition ( #23451 )
2023-02-08 07:07:36 +01:00
faa8b582de
Apply Rubocop Style/RedundantAssignment ( #23452 )
2023-02-08 07:06:50 +01:00
Nick Schonning