github-actions[bot]
954169966b
New Crowdin Translations (automated) ( #28245 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
11 months ago
github-actions[bot]
4238ec844d
New Crowdin Translations (automated) ( #28120 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
12 months ago
Claire
046141d2a4
Fix i18n unused check being tripped by `no` in YAML files ( #2496 )
12 months ago
Matt Jankowski
5631f139c1
Fix `Lint/SymbolConversion` cop ( #28175 )
12 months ago
Matt Jankowski
a8473f582d
Add zeitwerk inflector for cli->CLI ( #27635 )
12 months ago
Claire
85662a5a57
Change `img-src` and `media-src` CSP directives to not include `https:` ( #28025 )
12 months ago
Matt Jankowski
a1636fce7f
Move lib/devise/* to lib/devise/strategies/* ( #27638 )
12 months ago
Matt Jankowski
31bef99b9e
Move lib/mastodon/premailer_webpack_strategy to lib/ ( #27636 )
12 months ago
github-actions[bot]
af02484714
New Crowdin Translations (automated) ( #28096 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
12 months ago
github-actions[bot]
fad9343bab
New Crowdin Translations (automated) ( #28069 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
12 months ago
Claire
660372d130
Revert recent CSP changes ( #2485 )
...
* Revert "Fix image and media loading when using external storage server"
This reverts commit 6cfa0245ca
.
* Revert "Change glitch-soc's CSP config to match upstream's closer (#2474 )"
This reverts commit d59196e170
.
12 months ago
github-actions[bot]
8521238677
New Crowdin Translations (automated) ( #28060 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
12 months ago
github-actions[bot]
c810b197ad
New Crowdin Translations (automated) ( #28050 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
12 months ago
github-actions[bot]
d3ed03fd6b
New Crowdin Translations (automated) ( #28036 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
12 months ago
Claire
6cfa0245ca
Fix image and media loading when using external storage server
...
Fixes #2479
12 months ago
Matt Jankowski
6d51ac246b
Update partials for the `AdminMailer.new_trends` mailer ( #28011 )
12 months ago
github-actions[bot]
3c3e0c25ef
New Crowdin Translations (automated) ( #28015 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
12 months ago
Claire
d59196e170
Change glitch-soc's CSP config to match upstream's closer ( #2474 )
1 year ago
github-actions[bot]
8ceae2bce6
New Crowdin Translations (automated) ( #27966 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
github-actions[bot]
9c68741f46
New Crowdin Translations (automated) ( #27914 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
github-actions[bot]
7232d4750d
New Crowdin Translations (automated) ( #27884 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
Claire
bd575a1dd6
Add banner for forwarded reports made by remote users about remote content ( #27549 )
1 year ago
Eugen Rochko
d67bd44ca1
Add profile setup to onboarding in web UI ( #27829 )
1 year ago
github-actions[bot]
d8074128f9
New Crowdin Translations (automated) ( #27866 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
github-actions[bot]
c1e071f634
New Crowdin Translations (automated) ( #27848 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
Eugen Rochko
7e3c10dec6
Add icons for private and disabled boost in web UI ( #27817 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Claire
07a4059901
Add support for invite codes in the registration API ( #27805 )
1 year ago
github-actions[bot]
e5a7b73ef4
New Crowdin Translations (automated) ( #27815 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
GitHub Actions
46a28fc41f
New Crowdin translations
1 year ago
github-actions[bot]
ac62b995ef
New Crowdin Translations (automated) ( #27804 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
Matt Jankowski
9429e30d75
Disable sidekiq unique jobs in test env ( #27737 )
1 year ago
Claire
c451bbe249
Allow viewing and severing relationships with suspended accounts ( #27667 )
1 year ago
github-actions[bot]
d6c971e158
New Crowdin Translations (automated) ( #27787 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
Matt Jankowski
c875dfc90b
Fix `Lint/UnusedBlockArgument` cop ( #27777 )
1 year ago
Jaehong Kang
c73d5a6075
Using Sidekiq concurrency for default db pool value ( #26488 )
1 year ago
github-actions[bot]
5c328ae674
New Crowdin Translations (automated) ( #27768 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
Matt Jankowski
33cc3ae8fa
Fix `Style/StabbyLambdaParentheses` cop ( #27771 )
1 year ago
Renaud Chaput
757d7c73c0
Upgrade to Yarn 4, remove support for Node 16 ( #27073 )
1 year ago
Claire
23e32a4b30
Fix format-dependent redirects being cached regardless of requested format ( #27632 )
1 year ago
Matt Jankowski
02d27de5ce
Move i18n locale configuration to separate initializer ( #27571 )
1 year ago
Matt Jankowski
bbad5b6456
Remove false positive cop detection ( #27457 )
1 year ago
github-actions[bot]
1b28ab7263
New Crowdin Translations (automated) ( #27687 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
Matt Jankowski
d6f50839e1
Fix `RSpec/SpecFilePathFormat` cops ( #27730 )
1 year ago
github-actions[bot]
2d548e273e
New Crowdin Translations (automated) ( #27646 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
Matt Jankowski
7ef56d6e50
Move json_ld context loaders to `config/initializers` ( #27590 )
1 year ago
Matt Jankowski
3107a9410c
Silence deprecation warning about secrets/credentials with Devise patch ( #27578 )
1 year ago
Renaud Chaput
0e3401bc1c
Improve Babel configuration and automatically load polyfills ( #27333 )
1 year ago
github-actions[bot]
e5b7ae9576
New Crowdin Translations (automated) ( #27630 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
github-actions[bot]
a918208ec6
New Crowdin Translations (automated) ( #27596 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
Matt Jankowski
eae5c7334a
Extract class from CSP configuration/initialization ( #26905 )
1 year ago
Matt Jankowski
1f5187e2e2
Misc spec/refactor to user mailer and user mailer spec ( #27486 )
1 year ago
github-actions[bot]
8ca16f032e
New Crowdin Translations (automated) ( #27583 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
Claire
bbf46cc418
Fix error and incorrect URLs in `/api/v1/accounts/:id/featured_tags` for remote accounts ( #27459 )
1 year ago
Matt Jankowski
12550a6a28
Use `Rails.env.local?` shorthand method to check env ( #27519 )
1 year ago
Matt Jankowski
4aa05d45fc
Capture minimum postgres version 12 ( #27528 )
1 year ago
github-actions[bot]
3427b51d63
New Crowdin Translations (automated) ( #27567 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
Claire
49b8433c56
Fix confusing screen when visiting a confirmation link for an already-confirmed email ( #27368 )
1 year ago
Claire
62620956d5
Merge commit '9a3d047f3e604e581e18346424569e28fc9c5b96' into glitch-soc/merge-upstream
1 year ago
Matt Jankowski
9a3d047f3e
Run `bin/rails app:update` with Rails 7.1 ( #27522 )
1 year ago
Claire
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 8a131fb7bc
- `app/javascript/packs/public.jsx`:
Upstream fixed `@rails/ujs` imports.
Already taken care of in 8a131fb7bc
1 year ago
Claire
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
github-actions[bot]
c85e0a6b04
New Crowdin Translations (automated) ( #27544 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
Claire
4ef66d6538
Merge commit '15182d1e5e595b21c47b48c5d258f30a0251e753' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
glitch-soc had extra ignores.
Removed them.
1 year ago
Claire
3c9c0299c0
Fix ActiveRecord::Migrator monkey-patch
1 year ago
Claire
4b0fb764c3
Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream
...
Conflicts and ported changes:
- updated `@rails/ujs` imports
1 year ago
Eugen Rochko
134de736dc
Change icons in web UI ( #27385 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
1 year ago
Claire
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
Claire
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
Claire
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
github-actions[bot]
50b7ea810e
New Crowdin Translations (automated) ( #27523 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
Matt Jankowski
e93a75f1a1
Rails 7.1 update ( #25963 )
1 year ago
Claire
379115e601
Add SELF_DESTRUCT env variable to process self-destructions in the background ( #26439 )
1 year ago
Claire
99f2534cee
Add support for displaying unknown servers on /admin/instances/:domain ( #27150 )
1 year ago
Claire
c3e0eb3699
Change Content-Security-Policy to be tighter on media paths ( #26889 )
1 year ago
github-actions[bot]
70fd819935
New Crowdin Translations (automated) ( #27490 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
Matt Jankowski
ab0fb81479
Configure brakeman to ignore url safe preview card urls ( #25883 )
1 year ago
github-actions[bot]
284c719f64
New Crowdin Translations (automated) ( #27480 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
Claire
74fd46d3ab
Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream
1 year ago
Matt Jankowski
9f218c9924
Refactor appeal partial to avoid brakeman XSS warning ( #25880 )
1 year ago
Matt Jankowski
bcd0171e5e
Fix `Lint/UselessAssignment` cop ( #27472 )
1 year ago
github-actions[bot]
1ffd5a98a9
New Crowdin Translations (automated) ( #27465 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
github-actions[bot]
4612576c68
New Crowdin Translations (automated) ( #27454 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
Claire
63179f0bf4
Merge commit '5ef26d8fd50081c642b858a82bf0c5431b1c7e83' into glitch-soc/merge-upstream
1 year ago
Claire
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
Claire
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
Matt Jankowski
65cd0700e4
Refactor domains cli to remove model call from regex ( #25878 )
1 year ago
Wladimir Palant
23f8e93c64
Fixes #23135 - Allow cross origin request for /nodeinfo/2.0 API ( #27413 )
1 year ago
github-actions[bot]
13456efd7b
New Crowdin Translations (automated) ( #27410 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
Renaud Chaput
e0da64bb4e
Fix empty ENV variables not using default nil value ( #27400 )
1 year ago
github-actions[bot]
773d25e8df
New Crowdin Translations (automated) ( #27388 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
github-actions[bot]
c348b904a5
New Crowdin Translations (automated) ( #27376 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
github-actions[bot]
f1ae72ba46
New Crowdin Translations (automated) ( #27364 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
Claire
3735e6f79d
Merge commit '27e84c069112a3d2abfad947642457cc997a261a' into glitch-soc/merge-upstream
1 year ago
github-actions[bot]
1a2a4c389f
New Crowdin Translations (automated) ( #27347 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
Claire
3da7afdeed
Merge commit 'c310374a2f83a890520ace50e41c1e3d046e15e1' into glitch-soc/merge-upstream
1 year ago
github-actions[bot]
89b48681cf
New Crowdin Translations (automated) ( #27321 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
Claire
53f5b27bd1
Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream
1 year ago
Claire
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
Claire
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
Claire
e9a181c52c
Merge commit 'e95d25e1013b6328457b81bd98e8d6a841d45ec2' into glitch-soc/merge-upstream
1 year ago