欧醚
c6aa9146cc
hide full email address for admins
1 year ago
欧醚
7ce72ced97
version suffix
1 year ago
Claire
cbdb25ab03
Merge pull request #2151 from ClearlyClaire/glitch-soc/main
Merge upstream changes
1 year ago
neatchee
8215df76c0
[Glitch] Remove legacy decorators syntax
Port d1b057a0ac
to glitch-soc
1 year ago
Nick Schonning
00c839b9a9
[Glitch] Remove isNaN polyfill
Port b46125224c
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Claire
14b0311029
Merge branch 'main' into glitch-soc/main
1 year ago
Yamagishi Kazutoshi
6e8711ff91
Add missing parenthesis ( #24238 )
1 year ago
Yamagishi Kazutoshi
d1b057a0ac
Remove legacy decorators syntax ( #18357 )
1 year ago
Nick Schonning
503022d6f9
Exclude files for Rubocop Metrics/ClassLength ( #24213 )
1 year ago
Nick Schonning
e7e189fa44
Use Yarn production install for asset compile ( #24232 )
1 year ago
Plastikmensch
81e85782d1
Fix docker images not being pushed ( #2143 )
* Change repo from mastodon/mastodon to glitch-soc/mastodon
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Remove repo check from build-image workflow
Reverts 0b8b0ef652
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
1 year ago
Claire
867790e07a
Merge pull request #2144 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
1 year ago
Nick Schonning
b46125224c
Remove isNaN polyfill ( #24224 )
1 year ago
Christian Schmidt
16da4a09e8
Fix broken links in account gallery ( #24218 )
1 year ago
mogamin
b4f60bc6de
[Glitch] Fit the max-width of media in .prose to parent box
Port 0a9def5498
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Claire
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.
1 year ago
Claire
2626097869
Fix Rails cache namespace being overriden with `v2` for cached statuses ( #24202 )
1 year ago
Matt Jankowski
a7a578a055
Remove unused InstancePresenter methods ( #24206 )
1 year ago
Matt Jankowski
b179ff84c7
Add specs for Chewy importers ( #24204 )
1 year ago
Simon Elvery
148c3d5894
Update profile link verification instructions ( #19723 )
Co-authored-by: Effy Elden <effy@effy.space>
1 year ago
Claire
7f8e1bede4
Bump version to v4.1.1 ( #24201 )
1 year ago
Takeshi Umeda
38c84f57b6
Refactoring relations_map ( #24195 )
1 year ago
dependabot[bot]
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>
1 year ago
dependabot[bot]
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>
1 year ago
dependabot[bot]
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>
1 year ago
dependabot[bot]
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>
1 year ago
dependabot[bot]
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>
1 year ago
dependabot[bot]
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>
1 year ago
mogamin
0a9def5498
Fit the max-width of media in .prose to parent box ( #24180 )
1 year ago
Matt Jankowski
7bef11630d
Remove references to non-existent actions ( #24183 )
1 year ago
Claire
bdeb6ff180
Fix crash in `tootctl` commands making use of parallelization when Elasticsearch is enabled ( #24182 )
1 year ago
Eugen Rochko
0ca54a4105
Remove `Permissions-Policy` header from all responses ( #24124 )
1 year ago
Plastikmensch
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>
1 year ago
Vyr Cossont
94cbd808b5
Webhooks for local status.create, status.update, account.update ( #24133 )
1 year ago
Claire
9a111a615f
Merge pull request #2138 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
1 year ago
Claire
3091a184ca
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
Claire
00fe0f6cb4
Merge pull request #2136 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
1 year ago
Nick Schonning
34096bc6ea
Upgrade redis-node to latest ( #24154 )
1 year ago
Nick Schonning
f7b9b36fc3
Revert "Dedupe yarn.lock with yarn-deduplicate" ( #24155 )
1 year ago
Nick Schonning
9758112c97
Dedupe yarn.lock with yarn-deduplicate ( #24119 )
1 year ago
Jean byroot Boussier
160f38f03d
Workaround the ActiveRecord / Marshal serialization bug on Ruby 3.2 ( #24142 )
Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
1 year ago
Nick Schonning
b22b4bac03
Include config/ and update all rubcop deps ( #23963 )
1 year ago
CSDUMMI
d75a1e5054
Link to the Identity provider's account settings from the account settings ( #24100 )
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
dependabot[bot]
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>
1 year ago
dependabot[bot]
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>
1 year ago
Christian Schmidt
8f97ffe91e
[Glitch] Replace `Status#translatable?` with language matrix in separate endpoint
Port bd047acc35
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Claire
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.
1 year ago
Claire
f5daa20f2a
Merge pull request #2134 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
1 year ago
Nick Schonning
681dcd3fa3
Ignore additional Style/OptionalBooleanParameter ( #24138 )
1 year ago
Claire
8fdf49b11d
Add warning for object storage misconfiguration ( #24137 )
1 year ago