ac62b995ef
New Crowdin Translations (automated) ( #27804 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
9429e30d75
Disable sidekiq unique jobs in test env ( #27737 )
1 year ago
c451bbe249
Allow viewing and severing relationships with suspended accounts ( #27667 )
1 year ago
d6c971e158
New Crowdin Translations (automated) ( #27787 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
c875dfc90b
Fix `Lint/UnusedBlockArgument` cop ( #27777 )
1 year ago
c73d5a6075
Using Sidekiq concurrency for default db pool value ( #26488 )
1 year ago
5c328ae674
New Crowdin Translations (automated) ( #27768 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
33cc3ae8fa
Fix `Style/StabbyLambdaParentheses` cop ( #27771 )
1 year ago
757d7c73c0
Upgrade to Yarn 4, remove support for Node 16 ( #27073 )
1 year ago
23e32a4b30
Fix format-dependent redirects being cached regardless of requested format ( #27632 )
1 year ago
02d27de5ce
Move i18n locale configuration to separate initializer ( #27571 )
1 year ago
bbad5b6456
Remove false positive cop detection ( #27457 )
1 year ago
1b28ab7263
New Crowdin Translations (automated) ( #27687 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
d6f50839e1
Fix `RSpec/SpecFilePathFormat` cops ( #27730 )
1 year ago
2d548e273e
New Crowdin Translations (automated) ( #27646 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
7ef56d6e50
Move json_ld context loaders to `config/initializers` ( #27590 )
1 year ago
3107a9410c
Silence deprecation warning about secrets/credentials with Devise patch ( #27578 )
1 year ago
0e3401bc1c
Improve Babel configuration and automatically load polyfills ( #27333 )
1 year ago
e5b7ae9576
New Crowdin Translations (automated) ( #27630 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
a918208ec6
New Crowdin Translations (automated) ( #27596 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
eae5c7334a
Extract class from CSP configuration/initialization ( #26905 )
1 year ago
1f5187e2e2
Misc spec/refactor to user mailer and user mailer spec ( #27486 )
1 year ago
8ca16f032e
New Crowdin Translations (automated) ( #27583 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
bbf46cc418
Fix error and incorrect URLs in `/api/v1/accounts/:id/featured_tags` for remote accounts ( #27459 )
1 year ago
12550a6a28
Use `Rails.env.local?` shorthand method to check env ( #27519 )
1 year ago
4aa05d45fc
Capture minimum postgres version 12 ( #27528 )
1 year ago
3427b51d63
New Crowdin Translations (automated) ( #27567 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
49b8433c56
Fix confusing screen when visiting a confirmation link for an already-confirmed email ( #27368 )
1 year ago
62620956d5
Merge commit '9a3d047f3e604e581e18346424569e28fc9c5b96' into glitch-soc/merge-upstream
1 year ago
9a3d047f3e
Run `bin/rails app:update` with Rails 7.1 ( #27522 )
1 year ago
6e9f89e5b6
Merge commit 'c85e0a6b047f1a72ad970bc04c4e1be3f028b3d1' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/admin.jsx`:
Upstream fixed `@rails/ujs` imports.
Already taken care of in 8a131fb7bc8a131fb7bc
1 year ago
ba527c071f
Merge commit '134de736dcbc6aa613fd5aec21d983d92d8b0be8' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.jsx`:
Upstream changed how icons are handled, including on a line modified by
glitch-soc to bump the number of poll options.
Applied upstream's change, while keeping the increased number of poll
options.
1 year ago
c85e0a6b04
New Crowdin Translations (automated) ( #27544 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
4ef66d6538
Merge commit '15182d1e5e595b21c47b48c5d258f30a0251e753' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
glitch-soc had extra ignores.
Removed them.
1 year ago
3c9c0299c0
Fix ActiveRecord::Migrator monkey-patch
1 year ago
4b0fb764c3
Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream
...
Conflicts and ported changes:
- updated `@rails/ujs` imports
1 year ago
134de736dc
Change icons in web UI ( #27385 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
1 year ago
e25cc4deb7
Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream
...
Conflicts:
- `config/navigation.rb`:
Conflict due to glitch-soc having extra navigation items for its theming
system.
Ported upstream changes.
1 year ago
57c0de949b
Merge commit '8b770ce8110e6cd609a6769c66210d95e291e3e5' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Upstream changed how asset host CSP directives are used, and glitch-soc has
a pretty different CSP file.
It may be worth reconsidering the differences between upstream and glitch-soc
but for now, just port the change.
1 year ago
b0c76eaadd
Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
Upstream changed one import, close to a glitch-soc-only import to handle
different max character counts.
Ported upstream's change.
1 year ago
50b7ea810e
New Crowdin Translations (automated) ( #27523 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
e93a75f1a1
Rails 7.1 update ( #25963 )
1 year ago
379115e601
Add SELF_DESTRUCT env variable to process self-destructions in the background ( #26439 )
1 year ago
99f2534cee
Add support for displaying unknown servers on /admin/instances/:domain ( #27150 )
1 year ago
c3e0eb3699
Change Content-Security-Policy to be tighter on media paths ( #26889 )
1 year ago
70fd819935
New Crowdin Translations (automated) ( #27490 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
b24d7bb6f2
th: Merge remote-tracking branch 'glitch/main' ( 18eacc7a07)
1 year ago
ab0fb81479
Configure brakeman to ignore url safe preview card urls ( #25883 )
1 year ago
284c719f64
New Crowdin Translations (automated) ( #27480 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
74fd46d3ab
Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream
1 year ago
9f218c9924
Refactor appeal partial to avoid brakeman XSS warning ( #25880 )
1 year ago
bcd0171e5e
Fix `Lint/UselessAssignment` cop ( #27472 )
1 year ago
1ffd5a98a9
New Crowdin Translations (automated) ( #27465 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
4612576c68
New Crowdin Translations (automated) ( #27454 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
63179f0bf4
Merge commit '5ef26d8fd50081c642b858a82bf0c5431b1c7e83' into glitch-soc/merge-upstream
1 year ago
b867d4581e
Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/controllers/api/v1/timelines/tag_controller_spec.rb`:
Glitch-soc had a few extra lines in this file to account for a different
default setting. This file got replaced by
`spec/requests/api/v1/timelines/tag_spec.rb`, into which the glitch-soc
additions were moved too.
Additional changes:
- `spec/requests/api/v1/statuses/sources_spec.rb`:
Add glitch-soc-only attribute `content_type`.
1 year ago
656a41db2a
Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream has updated its README, we have a completely different one.
Kept ours.
- `app/views/auth/sessions/two_factor.html.haml`:
Upstream refactored stuff and the conflict is because of glitch-soc's theming
system.
Ported upstream changes while accounting for the different theming system.
1 year ago
65cd0700e4
Refactor domains cli to remove model call from regex ( #25878 )
1 year ago
23f8e93c64
Fixes #23135 - Allow cross origin request for /nodeinfo/2.0 API ( #27413 )
1 year ago
13456efd7b
New Crowdin Translations (automated) ( #27410 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
e0da64bb4e
Fix empty ENV variables not using default nil value ( #27400 )
1 year ago
773d25e8df
New Crowdin Translations (automated) ( #27388 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
c348b904a5
New Crowdin Translations (automated) ( #27376 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
f1ae72ba46
New Crowdin Translations (automated) ( #27364 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
3735e6f79d
Merge commit '27e84c069112a3d2abfad947642457cc997a261a' into glitch-soc/merge-upstream
1 year ago
1a2a4c389f
New Crowdin Translations (automated) ( #27347 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
3da7afdeed
Merge commit 'c310374a2f83a890520ace50e41c1e3d046e15e1' into glitch-soc/merge-upstream
1 year ago
89b48681cf
New Crowdin Translations (automated) ( #27321 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
53f5b27bd1
Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream
1 year ago
86c9c5afa0
Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/concerns/web_app_controller_concern.rb`:
Upstream changed the order of Action Controller filters for web app
controllers.
Glitch-soc has an extra filter due to its theming system.
Changed the order accordingly.
- `app/views/settings/preferences/appearance/show.html.haml`:
Conflict due to an extra newline in glitch-soc.
Removed that newline and applied upstream's changes.
1 year ago
ac2370778a
Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream
...
Conflicts:
- `config/environments/production.rb`:
Upstream enforced a code style change and glitch-soc had a few different lines.
Applied upstream's code style to glitch-soc's changes.
1 year ago
e9a181c52c
Merge commit 'e95d25e1013b6328457b81bd98e8d6a841d45ec2' into glitch-soc/merge-upstream
1 year ago
702d162998
Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/auth/registrations_controller.rb`:
Not a real conflict. Upstream removed the `set_instance_presenter` private
method from this class, and glitch-soc has an extra private method right
besides it for the theming system.
Removed `set_instance_presenter` as upstream did.
- `app/controllers/auth/sessions_controller.rb`:
Not a real conflict. Upstream removed the `set_instance_presenter` private
method from this class, and glitch-soc has an extra private method right
besides it for the theming system.
Removed `set_instance_presenter` as upstream did.
1 year ago
d7fcd70023
Merge commit '2016c5d912f400ae98ee03ce269112de2f9ec62d' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/cors.rb`:
Upstream refactored this file, and glitch-soc had local changes.
I could not find the rationale for the glitch-soc changes, so I
used upstream's version.
1 year ago
19ebf7797e
Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream
1 year ago
e0b54ed3e1
New Crowdin Translations (automated) ( #27304 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
32ab474472
New Crowdin Translations (automated) ( #27277 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
8e4251f9e7
New Crowdin Translations (automated) ( #27270 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
85db392464
Autofix Rubocop cops for config/ ( #24145 )
1 year ago
e95d25e101
New Crowdin Translations (automated) ( #27260 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
ee866ec0e0
New Crowdin Translations (automated) ( #27220 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
695e42de0d
New Crowdin Translations (automated) ( #27202 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
56c0babc0b
Fix rubocop `Layout/ArgumentAlignment` cop ( #26060 )
1 year ago
b93ce7d8b3
New Crowdin Translations (automated) ( #27168 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
ebd2017524
fix Content-Security-Policy when using Azure storage ( #2427 )
1 year ago
abdb58840a
Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream
1 year ago
5ea3e8e765
New Crowdin Translations (automated) ( #27144 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
736fe75346
New Crowdin Translations (automated) ( #27080 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
e824585523
New Crowdin Translations (automated) ( #27052 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
f05985f8ec
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream changed their README, we have a completely different one.
Kept our version.
1 year ago
8acc75435b
Change S3 checksum mode to be disabled by default ( #27007 )
1 year ago
effe4728cf
New Crowdin Translations (automated) ( #27005 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
61fe25fe74
New Crowdin Translations (automated) ( #26988 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
150feaf9b7
th: Merge remote-tracking branch 'glitch/main'
1 year ago
f546b0c999
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
65646a3e89
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
73ecc4de6e
New Crowdin Translations (automated) ( #26978 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
a68f361a5f
New Crowdin Translations (automated) ( #26978 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
1e87575b70
Merge commit '6eb6209d02514c5271238a23601be643c7b9f52d' into glitch-soc/merge-upstream
1 year ago
97740f900c
Merge commit 'fd4f319fd20631f171b1f862b8c1f32f605b3166' into glitch-soc/merge-upstream
1 year ago
67eaaa4b90
New Crowdin Translations (automated) ( #26966 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
e39dfc701f
New Crowdin Translations (automated) ( #26966 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
1b4902fabf
New Crowdin Translations (automated) ( #26913 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
654bc9974d
New Crowdin Translations (automated) ( #26913 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
9d32bdbcde
th: Merge remote-tracking branch 'glitch/main'
1 year ago
5ed72f668f
Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream
1 year ago
8c51fac1b6
Merge commit 'e7698cb4ab17ac9eebbaef64b29f8cb9772a5478' into glitch-soc/merge-upstream
1 year ago
e193c848fe
Merge commit '97e4011c3ce31c6d492d5f103e95a35b6ebdc9bd' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Upstream added some code to add the Identity Provider's sign-in endpoint to
the `form-action` Content Security Policy directive but our version of the
file is pretty different.
Ported the change.
1 year ago
3947d7a153
Merge commit 'aeae2ebc0159bc2caadfc52313545f8e69c035e7' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Upstream added some code to add the Identity Provider's sign-in endpoint to
the `form-action` Content Security Policy directive but our version of the
file is pretty different.
Ported the change.
1 year ago
08b495d95c
Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream
1 year ago
296e8f791e
Merge commit '1efbb6202400d84024e68975c5cedd65efe71a80' into glitch-soc/merge-upstream
1 year ago
5d8c65f2a7
Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream
1 year ago
4127a9d9fe
Merge commit 'a8d18668b2dd066e316c8bb0a712dd19911cdd59' into glitch-soc/merge-upstream
1 year ago
a04ae16201
Fix CSP when using `ONE_CLICK_SSO_LOGIN` ( #26901 )
1 year ago
323f9cd61a
Fix CSP when using `ONE_CLICK_SSO_LOGIN` ( #26901 )
1 year ago
921c6fe654
New Crowdin Translations (automated) ( #26498 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
f933127c7f
New Crowdin Translations (automated) ( #26498 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
20666482ef
Added admin api for managing tags ( #26872 )
1 year ago
6fb81e40fd
Added admin api for managing tags ( #26872 )
1 year ago
9a70cac9de
Fix #26849 by adding the domain of the current SSO provider to the form-action CSP ( #26857 )
1 year ago
99e34fed97
Fix #26849 by adding the domain of the current SSO provider to the form-action CSP ( #26857 )
1 year ago
e9b528eaee
Use NodeJS v20 by default ( #26830 )
1 year ago
0c43169d93
Use NodeJS v20 by default ( #26830 )
1 year ago
475783d567
Add timezone to datetimes in e-mails ( #26822 )
1 year ago
834bbc141e
Add timezone to datetimes in e-mails ( #26822 )
1 year ago
77caba3789
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
3582239913
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
cab4cbfa5c
Fix “Scoped order is ignored, it's forced to be batch order.” warnings ( #26793 )
1 year ago
96f51d6c1f
Fix “Scoped order is ignored, it's forced to be batch order.” warnings ( #26793 )
1 year ago
e66f961e05
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
ef01aa71a9
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
ea31929776
Fix invalid Content-Type header for WebP images ( #26773 )
1 year ago
e51426c1dc
Fix invalid Content-Type header for WebP images ( #26773 )
1 year ago
c107512fa6
Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream
1 year ago
78a851ae0a
Merge commit '1b7b338d0a8fd34824aed80327d62526da9c5eac' into glitch-soc/merge-upstream
1 year ago
4ed629cd7e
Merge commit 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/form/admin_settings.rb`:
Upstream added the notion of overriden settings, while we had extra code for
pseudo-settings (only used to combine flavour and skin in a single select
field).
Ported upstream changes.
- `config/i18n-tasks.yml`:
Upstream added `simple_form.overridden` to `ignore_unused`,
we had `simple_form.glitch_only`.
Added `simple_form.glitch_only` as well.
1 year ago
63969b15b3
Merge commit '8bffce5f015ace5b73d5a8aa746c02e374d927bb' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/form/admin_settings.rb`:
Upstream added the notion of overriden settings, while we had extra code for
pseudo-settings (only used to combine flavour and skin in a single select
field).
Ported upstream changes.
- `config/i18n-tasks.yml`:
Upstream added `simple_form.overridden` to `ignore_unused`,
we had `simple_form.glitch_only`.
Added `simple_form.glitch_only` as well.
1 year ago
afc3b12217
Merge commit '4ad1c5aa7174e5cef4ba9608a44429916a119bee' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream has updated their README, we have a completely different one.
Kept ours.
- `config/initializers/content_security_policy.rb`:
Upstream has updated their development CSPs, while we disable CSPs in
the development environment.
Kept our version.
1 year ago
5d5d0c06d8
Merge commit 'dec7a90989c823dba7f6322c3359c3cd861812e9' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream has updated their README, we have a completely different one.
Kept ours.
- `config/initializers/content_security_policy.rb`:
Upstream has updated their development CSPs, while we disable CSPs in
the development environment.
Kept our version.
1 year ago
fbbe9f1c12
Merge commit 'a7d96e6affd4a2da65f09f3f4ffa1b9350bb9a42' into glitch-soc/merge-upstream
1 year ago
1ef0758cf0
Merge commit 'f8b5f05d440796970b761dafb4bfea1784884ecf' into glitch-soc/merge-upstream
1 year ago
6b7c47311d
Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream
1 year ago
52ce0a1c1d
Merge commit 'c833282412b5dec6999fa76ac74cd8ba8a0394c5' into glitch-soc/merge-upstream
1 year ago
16681e0f20
Add admin notifications for new Mastodon versions ( #26582 )
1 year ago
97238e3496
Add admin notifications for new Mastodon versions ( #26582 )
1 year ago
9e26cd5503
Add `authorized_fetch` server setting in addition to env var ( #25798 )
1 year ago
7d3930a520
Add `authorized_fetch` server setting in addition to env var ( #25798 )
1 year ago
075cc8e8a6
Improve Codespaces port forwarding ( #26400 )
1 year ago
c536148396
Improve Codespaces port forwarding ( #26400 )
1 year ago
286a21afdc
Support webpacker live-reloading on Docker ( #26419 )
1 year ago
5d8b227748
Support webpacker live-reloading on Docker ( #26419 )
1 year ago
a7d96e6aff
Improve error messages when DeepL quota is exceeded ( #26704 )
1 year ago
f8b5f05d44
Improve error messages when DeepL quota is exceeded ( #26704 )
1 year ago
786e586686
New Crowdin translations ( #2388 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
9a65f28e9e
New Crowdin translations ( #2388 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
7c7355a964
th: Merge remote-tracking branch 'glitch/main' ( d033fab0ed)
1 year ago
efb1888320
New Crowdin translations ( #2376 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
d033fab0ed
New Crowdin translations ( #2376 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
941a9df28a
Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-nightly.yml`:
Upstream changed how the nightly builds are versioned, the conflict
is because glitch-soc modified adjacent lines relative to the docker
repositories the images are pushed to.
Applied upstream's changes.
- `app/views/settings/preferences/notifications/show.html.haml`:
Upstream moved some settings around. Glitch-soc had more settings.
Applied upstream's changes, moving glitch-soc's extra settings
accordingly.
1 year ago
592a675a33
Merge commit '14de2ab8804ca9c765e99d5d22383cc9079c53f8' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-nightly.yml`:
Upstream changed how the nightly builds are versioned, the conflict
is because glitch-soc modified adjacent lines relative to the docker
repositories the images are pushed to.
Applied upstream's changes.
- `app/views/settings/preferences/notifications/show.html.haml`:
Upstream moved some settings around. Glitch-soc had more settings.
Applied upstream's changes, moving glitch-soc's extra settings
accordingly.
1 year ago
296b3d1560
Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream re-generated the file, while glitch-soc has a specific ignore
for some file.
Updated the file as upstream did and kept our extra ignore.
- `config/webpack/shared.js`:
Upstream added a plugin, but our files are pretty different.
Added the plugin as well.
- `spec/helpers/application_helper_spec.rb`:
Upstream refactored tests, but part of them were different because
of glitch-soc's theming system.
Applied the refactoring to glitch-soc's change.
1 year ago
17e93dbce5
Merge commit 'b085dcc921497f08e72cb29cf0b5cb07699d9d74' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream re-generated the file, while glitch-soc has a specific ignore
for some file.
Updated the file as upstream did and kept our extra ignore.
- `config/webpack/shared.js`:
Upstream added a plugin, but our files are pretty different.
Added the plugin as well.
- `spec/helpers/application_helper_spec.rb`:
Upstream refactored tests, but part of them were different because
of glitch-soc's theming system.
Applied the refactoring to glitch-soc's change.
1 year ago
88ff45a3b2
Merge commit 'facfec1ba36cee27f232ebff90b990933719235a' into glitch-soc/merge-upstream
1 year ago
d0a26a2a16
Merge commit 'd4eef922aa794489a027575a560e4b09c68c153e' into glitch-soc/merge-upstream
1 year ago
fbfc4145fd
Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/public.jsx`:
Upstream updated code that we actually moved to `app/javascript/core/settings.js`.
Applied the changes there.
1 year ago
1f30778ec6
Merge commit 'd38310bed22bdf2be6ef0e49f325715685b74400' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/public.jsx`:
Upstream updated code that we actually moved to `app/javascript/core/settings.js`.
Applied the changes there.
1 year ago
30c191aaa0
Add new public status index ( #26344 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
e82d84469e
Add new public status index ( #26344 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
163b004bb1
Change admin e-mail notification settins to be their own settings group ( #26596 )
1 year ago
a4f3a67bd8
Change admin e-mail notification settins to be their own settings group ( #26596 )
1 year ago
452f15be78
Move glitch-soc's “Hide followers count” setting to “Show followers count” under “Privacy and reach” tab
1 year ago
4e353aa9be
Move glitch-soc's “Hide followers count” setting to “Show followers count” under “Privacy and reach” tab
1 year ago
10404aece8
Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream
1 year ago
c52397dea3
Merge commit '8f40a96f28a5cdf5e52c40f57b8adf63165ce6d3' into glitch-soc/merge-upstream
1 year ago
2126812f65
Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
Upstream moved some settings, where glitch-soc has an extra setting.
Ported upstream changes, moving the same settings as them.
1 year ago
b6ca020d02
Merge commit 'bd7f631918b3acbecf0c385008389ba22c945dbe' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
Upstream moved some settings, where glitch-soc has an extra setting.
Ported upstream changes, moving the same settings as them.
1 year ago
bb2db2aec0
Add `circular-dependency-plugin` to detect any circular deps issues ( #26600 )
1 year ago
78aecc7444
Add `circular-dependency-plugin` to detect any circular deps issues ( #26600 )
1 year ago
7e25e311d5
Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream
1 year ago
ccf5f88e43
Merge commit '89b675cb07886dcc72ef52b6f778679d7099d96c' into glitch-soc/merge-upstream
1 year ago
ac0eb0533e
Add Elasticsearch cluster health check and indexes mismatch check to dashboard ( #26448 )
1 year ago
0ce3130ef8
Add Elasticsearch cluster health check and indexes mismatch check to dashboard ( #26448 )
1 year ago
191d302b7f
Refactor `Api::V1::ProfilesController` into two separate controllers ( #26573 )
1 year ago
5458629e60
Refactor `Api::V1::ProfilesController` into two separate controllers ( #26573 )
1 year ago
d24a87ce4f
Add ability to delete avatar or header picture via the API ( #25124 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
89d2b28e0b
Add ability to delete avatar or header picture via the API ( #25124 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
b95867ad1f
Allow setting a custom HTTP method in CacheBuster ( #26528 )
...
Co-authored-by: Jorijn Schrijvershof <jorijn@jorijn.com>
1 year ago
f4a6879caf
Allow setting a custom HTTP method in CacheBuster ( #26528 )
...
Co-authored-by: Jorijn Schrijvershof <jorijn@jorijn.com>
1 year ago
cc4560d95b
Change “privacy and reach” settings so that unchecking boxes always increase privacy and checking them always increase reach ( #26508 )
1 year ago
4b4228c0cd
Change “privacy and reach” settings so that unchecking boxes always increase privacy and checking them always increase reach ( #26508 )
1 year ago
dd049fc37a
Fix ES_PRESET not being applied to Chewy's internal index ( #26489 )
1 year ago
90e403ba4d
Fix ES_PRESET not being applied to Chewy's internal index ( #26489 )
1 year ago
fc5ab2dc83
Add privacy tab in profile settings ( #26484 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
1 year ago
738b024d0c
Add privacy tab in profile settings ( #26484 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
1 year ago
f5778caa3a
Add `ES_PRESET` option to customize numbers of shards and replicas ( #26483 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
1 year ago
6c6f3c9148
Add `ES_PRESET` option to customize numbers of shards and replicas ( #26483 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
1 year ago
c452ccd913
New Crowdin Translations (automated) ( #26444 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
30f84f10b1
New Crowdin Translations (automated) ( #26444 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
6530f9709c
Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream regenerated this file, glitch-soc had a specific ignore.
1 year ago
33024cca51
Merge commit '13a4a81f022a1b944dd65acb1041dc76093b0901' into glitch-soc/main
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream regenerated this file, glitch-soc had a specific ignore.
1 year ago
github-actions[bot]
Matt Jankowski
Claire
Jaehong Kang
Renaud Chaput
Eugen Rochko
kouhai
Wladimir Palant
Nick Schonning
Georg Gadinger
Kouhai
Robert R George
CSDUMMI
Christian Schmidt
Lukas Martini
jsgoldstein
Daniel M Brasil