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
235a4cfdc8
Fix batch attachment deletion when using OpenStack Swift ( #27554 )
1 year ago
a4e6fe36cb
Add missing ban icons ( #27555 )
1 year ago
70dbf84b9b
Solve simplest haml-lint `Rubocop` lints ( #27529 )
1 year ago
fa65c8244f
Fix cache store pool config deprecation warnings ( #27551 )
1 year ago
c926f5fd67
Fix haml-lint `UnnecessaryStringOutput` for views ( #27531 )
1 year ago
85d4846d8a
[Glitch] Fix `<ColumnBackButtonSlim>`
...
Port cb92cdf9af
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
f261b6499f
Update dependency node to 20.9 ( #27534 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
cec7f0ed72
Remove unused `#error_explanation` id from error partials ( #27536 )
1 year ago
cb92cdf9af
Fix `<ColumnBackButtonSlim>` ( #27540 )
1 year ago
f08ca3f042
Fix missing icon props ( #27539 )
1 year ago
bc3afb6311
Update `rails/ujs` delegate method usage ( #27538 )
1 year ago
b19d4eb43d
Fix HAML linting issues
1 year ago
8123e86623
[Glitch] Fix double scroll bars in some columns in advanced interface
...
Port 37bbd3c106
1 year ago
b73e4b59fc
[Glitch] Fix history handling not properly handling states after update to react-router v5
...
Port 15182d1e5e
1 year ago
c6f990997d
[Glitch] Rewrite `emoji_unicode_mapping_light` to TS
...
Port 9482810703
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
8a131fb7bc
Fix `@rails/ujs` imports
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
b1885387b6
Fix missing libyaml-dev dependency in Dockerfile ( #27533 )
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
69ea596e55
[Glitch] Fix explore page reloading when you navigate back to it in web UI
...
Port d9503a1965
1 year ago
e6c3d3c744
Merge commit 'd9503a1965a16328b62ea7bf0bb54e87cbe30d29' into glitch-soc/merge-upstream
1 year ago
79c154f602
Merge commit 'fc7734df8d8d53639bf244a2f2f3c39bc2fd12a7' into glitch-soc/merge-upstream
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
787d5ad386
Merge commit 'bcae7442757845191c0e82b61cd1d0cd3ca860d1' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Caused by a glitch-soc-only dependency (`exif-js`).
Kept it.
1 year ago
5323f0eeca
[Glitch] Fix incorrect proptypes from react-router-v5 update
...
Port 0ad66175bf
1 year ago
9325cb5759
[Glitch] Convert `<Button>` to Typescript
...
Port 9d45a444f9
1 year ago
1138d44c7d
[Glitch] Fix missing background behind dismissable banner in web UI
...
Port 33bd8eccd5
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
15182d1e5e
Fix history handling not properly handling states after update to react-router v5 ( #27526 )
1 year ago
6cf9f1211b
Create custom Github Actions for common steps ( #27518 )
1 year ago
714e3ae5b5
Use Rails 7.1 `normalizes` feature ( #27521 )
1 year ago
50b7ea810e
New Crowdin Translations (automated) ( #27523 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
e923bb9ec9
Use `ENV.fetch` in views, fixes rubocop haml-lint issue ( #27527 )
1 year ago
4fdc548fa5
Regenerate lint todos ( #27513 )
1 year ago
9482810703
Rewrite `emoji_unicode_mapping_light` to TS ( #25444 )
...
Co-authored-by: taichi.fukuda ひ <taichi.fukuda@systemi.co.jp>
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
26d2a2a0cc
Migrate to request specs in `/api/v1/media` ( #25543 )
1 year ago
d9503a1965
Fix explore page reloading when you navigate back to it in web UI ( #27489 )
1 year ago
79a63201a9
Fix Layout/EmptyLineAfterGuardClause issues caused by merging an old PR ( #27512 )
1 year ago
fc7734df8d
Remove Renovate's Lock File Maintenance task ( #27510 )
1 year ago
3cfdab6b48
Prune the changelog of older entries ( #27432 )
1 year ago
Claire
Matt Jankowski
Renaud Chaput
github-actions[bot]
renovate[bot]
たいち ひ
Eugen Rochko
Michael Stanclift
Daniel M Brasil