97e8fe9eae
Merge pull request #2159 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2 years ago
90ecb96dba
[Glitch] Add colour to follow button when hashtag is being followed
...
Port d5da587d27
2 years ago
5fbae7cb2a
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
6f60f2e2b8
Merge pull request #2155 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2 years ago
d5da587d27
Add colour to follow button when hashtag is being followed ( #24361 )
2 years ago
5ff9f89c05
Bump uri from 0.12.0 to 0.12.1 ( #24341 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
d586a37618
Clean up JS dependencies ( #24377 )
2 years ago
e03f9b38c5
Change root Chewy strategy to emit a warning instead of erroring out in production mode ( #24327 )
2 years ago
1c1bbbebd6
New Crowdin updates ( #24276 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
d0bf149232
Move ESLint configs to overrides ( #24370 )
2 years ago
eb171b7ce4
Fix build issues caused by #16210 ( #24374 )
2 years ago
4866812b28
[Proposal] Make able to write React in Typescript ( #16210 )
...
Co-authored-by: berlysia <berlysia@gmail.com>
Co-authored-by: fusagiko / takayamaki <takayamaki@users.noreply.github.com>
2 years ago
218e88df65
Update redis_config.rb to remove warning message ( #24352 )
2 years ago
b12fcd3d7a
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
d22e712648
Change search pop-out in web UI ( #24305 )
2 years ago
4e63f1e64b
Fix regressions from change in account row design in web UI ( #24343 )
2 years ago
15f9f8962e
Fix Redis client and type errors introduced in #24285 ( #24342 )
2 years ago
f9cc42d6db
[Glitch] Fix: set multiColumn value for /explore Statuses
...
Port d339684df5
2 years ago
bba0493afe
[Glitch] Move marky to devDependency
...
Port a159e8e5e1
2 years ago
5e6da39214
Restore exif-js dependency
2 years ago
bb5b3182f0
Migrate glitch-soc's exclusive user settings
2 years ago
db2b09bdd4
Fix invalid/expired invites being processed on sign-up ( #24337 )
2 years ago
1a0c54554f
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream added a link to the roadmap, but we have a completely different README.
Kept ours.
- `app/models/media_attachment.rb`:
Upstream upped media attachment limits.
Updated the default according to upstream's.
- `db/migrate/20180831171112_create_bookmarks.rb`:
Upstream changed the migration compatibility level.
Did so too.
- `config/initializers/content_security_policy.rb`:
Upstream refactored this file but we have a different version.
Kept our version.
- `app/controllers/settings/preferences_controller.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
The file does not directly references individual settings anymore.
Applied upstream changes.
- `app/lib/user_settings_decorator.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
The file got removed entirely.
Removed it as well.
- `app/models/user.rb`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
References to individual settings have been removed from the file.
Removed them as well.
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/notifications/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/other/show.html.haml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
Applied upstream's changes and ported ours back.
- `config/settings.yml`:
Upstream completely refactored user settings storage, and glitch-soc has a
different set of settings.
In particular, upstream removed user-specific and unused settings.
Did the same in glitch-soc.
- `spec/controllers/application_controller_spec.rb`:
Conflicts due to glitch-soc's theming system.
Mostly kept our version, as upstream messed up the tests.
2 years ago
f7bc9e2fcd
Add Roadmap to README ( #24288 )
2 years ago
fbe173fe35
Bump ruby to 3.2.2 due to ReDoS vulnerabilities ( #24320 )
2 years ago
e400e6d2bb
Add documentation for Rubocop overrides ( #23811 )
2 years ago
5f1a0f550b
Autofix Rubocop Rails/IgnoredColumnsAssignment ( #23761 )
2 years ago
3cf19b953f
IndexingScheduler: fetch and import in batches ( #24285 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
2a0d2453b0
Autofix Rubocop Style/IdenticalConditionalBranches ( #24322 )
2 years ago
718cdb0286
Enable Rubocop Metrics/BlockLength with Excludes ( #24260 )
2 years ago
41190c8172
Wrong type for user setting when default is defined by lambda ( #24321 )
2 years ago
868d478b1b
Change "direct message" nomenclature to "private mention" in web UI ( #24248 )
2 years ago
c75fccf033
Change user settings to be stored in a more optimal way ( #23630 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
13fb0cc4f0
Fix stale apt index in github actions ( #24319 )
2 years ago
eb8d0e0dfc
Bump cssnano from 5.1.15 to 6.0.0 ( #24296 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
d339684df5
Fix: set multiColumn value for /explore Statuses ( #24314 )
2 years ago
a9715ecd73
Fix missing translation in pagination gap tags ( #24262 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2 years ago
f8c5b58f94
Fixes launching of the devcontainer and adds support for Docker Desktop ( #24303 )
2 years ago
0771672b23
Bump sass from 1.59.3 to 1.60.0 ( #24292 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
d865ecc9a3
Bump rimraf from 4.4.0 to 4.4.1 ( #24291 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
2e03db257a
Bump react-textarea-autosize from 8.4.0 to 8.4.1 ( #24293 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
72b4973f50
Requeue expiration notification ( #24311 )
2 years ago
cb96dd2a2c
Bump react-select from 5.7.1 to 5.7.2 ( #24294 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
313043a38f
Bump prettier from 2.8.5 to 2.8.7 ( #24295 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
ac792ced54
Bump mkdirp from 2.1.5 to 2.1.6 ( #24297 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
041c1c5305
Bump glob from 9.3.0 to 9.3.2 ( #24298 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
b727d96093
Bump aws-sdk-s3 from 1.119.1 to 1.119.2 ( #24299 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
c728972888
Bump tzinfo-data from 1.2022.7 to 1.2023.2 ( #24300 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2 years ago
5e88776f9d
Wrap db:setup with Chewy.strategy(:mastodon) ( #24302 )
2 years ago
1cec8e6335
Use Yarn instead of NPX for pre-commit hook ( #24287 )
2 years ago
Claire
Christian Schmidt
dependabot[bot]
Eugen Rochko
Nick Schonning
Renaud Chaput
fusagiko / takayamaki
Alison Wheeler
Vyr Cossont
Tdxdxoz
Sai
mogamin
Robert R George