5ac380c122
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/status.rb`:
Upstream added lines close to a glitch-soc only line, not a real conflict.
Applied upstream's changes (added hooks) while keeping glitch-soc's changes
(`local_only` scope).
- `config/environments/production.rb`:
Upstream removed a header, while we have glitch-soc specific ones.
Removed the header removed upstream.
2 years ago
2626097869
Fix Rails cache namespace being overriden with `v2` for cached statuses ( #24202 )
2 years ago
a7a578a055
Remove unused InstancePresenter methods ( #24206 )
2 years ago
b179ff84c7
Add specs for Chewy importers ( #24204 )
2 years ago
148c3d5894
Update profile link verification instructions ( #19723 )
...
Co-authored-by: Effy Elden <effy@effy.space>
2 years ago
7f8e1bede4
Bump version to v4.1.1 ( #24201 )
2 years ago
38c84f57b6
Refactoring relations_map ( #24195 )
2 years ago
9f8d1601a4
Bump stackprof from 0.2.23 to 0.2.24 ( #24190 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
a4d285f2f9
Bump prettier from 2.8.4 to 2.8.5 ( #24188 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
de6d504023
Bump stylelint from 15.2.0 to 15.3.0 ( #24185 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
f20843e60d
Bump react-select from 5.7.0 to 5.7.1 ( #24187 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
84f14b2451
Bump rack-cors from 1.1.1 to 2.0.1 ( #24189 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
4f4cbce295
Bump pghero from 3.3.0 to 3.3.1 ( #24186 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
0a9def5498
Fit the max-width of media in .prose to parent box ( #24180 )
2 years ago
7bef11630d
Remove references to non-existent actions ( #24183 )
2 years ago
bdeb6ff180
Fix crash in `tootctl` commands making use of parallelization when Elasticsearch is enabled ( #24182 )
2 years ago
0ca54a4105
Remove `Permissions-Policy` header from all responses ( #24124 )
2 years ago
02ac94490a
Add getting-started-misc to route ( #2141 )
...
* Add getting-started-misc to web_app_paths
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Add signed in check to navigation entries
Enabling routing for getting-started-misc allows the column to be directly accessible, which showed every entry and threw unnecessary errors.
Also fixed the keys as these were literally "i++".
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Remove "Extended information" from getting-started-misc
I couldn't find any reference to this translation string, so I removed it too.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2 years ago
94cbd808b5
Webhooks for local status.create, status.update, account.update ( #24133 )
2 years ago
9a111a615f
Merge pull request #2138 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2 years ago
3091a184ca
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
00fe0f6cb4
Merge pull request #2136 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2 years ago
34096bc6ea
Upgrade redis-node to latest ( #24154 )
2 years ago
f7b9b36fc3
Revert "Dedupe yarn.lock with yarn-deduplicate" ( #24155 )
2 years ago
9758112c97
Dedupe yarn.lock with yarn-deduplicate ( #24119 )
2 years ago
160f38f03d
Workaround the ActiveRecord / Marshal serialization bug on Ruby 3.2 ( #24142 )
...
Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
2 years ago
b22b4bac03
Include config/ and update all rubcop deps ( #23963 )
2 years ago
d75a1e5054
Link to the Identity provider's account settings from the account settings ( #24100 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
be9a4912d8
Bump rimraf from 4.1.2 to 4.4.0 ( #24048 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
f53970abce
Bump glob from 8.1.0 to 9.3.0 ( #24110 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
8f97ffe91e
[Glitch] Replace `Status#translatable?` with language matrix in separate endpoint
...
Port bd047acc35
2 years ago
193250556c
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.
2 years ago
f5daa20f2a
Merge pull request #2134 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2 years ago
681dcd3fa3
Ignore additional Style/OptionalBooleanParameter ( #24138 )
2 years ago
8fdf49b11d
Add warning for object storage misconfiguration ( #24137 )
2 years ago
75e5a6e437
Change user backups to use expiring URLs for download when possible ( #24136 )
2 years ago
edc7ca5920
Roll back unintentionally activated rubocop rules ( #24132 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Nick Schonning <nschonni@gmail.com>
2 years ago
a085901108
New Crowdin updates ( #23904 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
bd047acc35
Replace `Status#translatable?` with language matrix in separate endpoint ( #24037 )
2 years ago
630436ab2d
Refactor monkey-patching of `PrivateAddressCheck` ( #24122 )
2 years ago
aa947a143b
Regen rubocop-todo without Max shadowing ( #24076 )
2 years ago
f57bcb028b
Bump sass from 1.58.3 to 1.59.3 ( #24105 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
aa7d63d9aa
Bump autoprefixer from 10.4.13 to 10.4.14 ( #24108 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
f0e727f958
Add cache headers to static files served through Rails ( #24120 )
2 years ago
be488adf71
Bump @babel/core from 7.21.0 to 7.21.3 ( #24111 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
8cb2543ee5
Add `SENDFILE_HEADER` environment variable ( #24123 )
2 years ago
6fa81ca17e
Remove `bullet` and `active_record_query_trace` gems ( #24121 )
2 years ago
dbbd462c10
Bump eslint from 8.35.0 to 8.36.0 ( #24089 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
b9618c82e3
Bump @babel/eslint-parser from 7.19.1 to 7.21.3 ( #24109 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
b1b8a27b42
Bump immutable from 4.2.4 to 4.3.0 ( #24088 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
Claire
Matt Jankowski
Simon Elvery
Takeshi Umeda
dependabot[bot]
mogamin
Eugen Rochko
Plastikmensch
Vyr Cossont
Nick Schonning
Jean byroot Boussier
CSDUMMI
Christian Schmidt