Merge commit '31abef8917879917a330419fe3981a2fb7f35b69' into glitch-soc/merge-upstream
Conflicts: - `app/services/post_status_service.rb`: Upstream added a line adjacent to one that had been modified due to local-only posting. Added upstream's change. - `tsconfig.json`: Upstream updated Typescript and updated `tsconfig` in the process by changing paths, where glitch-soc had extra paths. Updated as upstream did.
This commit is contained in:
commit
79958d9442
209 files changed
+2115
-1265
No files matched your search
@@ -124,7 +124,6 @@ jobs:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
ruby-version:
|
||||
- '3.2'
|
||||
- '3.3'
|
||||
- '.ruby-version'
|
||||
steps:
|
||||
@@ -217,7 +216,6 @@ jobs:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
ruby-version:
|
||||
- '3.2'
|
||||
- '3.3'
|
||||
- '.ruby-version'
|
||||
|
||||
@@ -348,7 +346,6 @@ jobs:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
ruby-version:
|
||||
- '3.2'
|
||||
- '3.3'
|
||||
- '.ruby-version'
|
||||
search-image:
|
||||
@@ -387,10 +384,3 @@ jobs:
|
||||
with:
|
||||
name: test-search-logs-${{ matrix.ruby-version }}
|
||||
path: log/
|
||||
|
||||
- name: Archive test screenshots
|
||||
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
|
||||
if: failure()
|
||||
with:
|
||||
name: test-search-screenshots
|
||||
path: tmp/capybara/
|
||||
Reference in new issue
Block a user