Skip to content

Commit 2b62126

Browse files
committed
Merge remote-tracking branch 'origin/main' into filterable_tree_view
2 parents e1f95d7 + 376215b commit 2b62126

84 files changed

Lines changed: 2440 additions & 2681 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
File renamed without changes.

.eslintrc.json

Lines changed: 0 additions & 84 deletions
This file was deleted.

.gitattributes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
CHANGELOG.md merge=ours
2+
Gemfile.lock merge=ours
3+
demo/Gemfile.lock merge=ours
4+
lib/primer/view_components/version.rb merge=ours
5+
package-lock.json merge=ours

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
3636
- name: Create release pull request or publish to npm
3737
id: changesets
38-
uses: changesets/action@v1
38+
uses: changesets/action@v1.4.10
3939
with:
4040
title: Release Tracking
4141
version: npm run changeset:version

.github/workflows/static-files.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
bundle exec rake utilities:build
3030
bundle exec rake docs:build
3131
bundle exec rake static:dump
32-
- uses: stefanzweifel/git-auto-commit-action@v5
32+
- uses: stefanzweifel/git-auto-commit-action@v6
3333
with:
3434
commit_message: Generating static files
3535
commit_user_name: OpenProject CI

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ jobs:
259259
continue-on-error: true
260260
run: ./script/run-playwright
261261
- id: auto-commit
262-
uses: stefanzweifel/git-auto-commit-action@v5
262+
uses: stefanzweifel/git-auto-commit-action@v5.2.0
263263
with:
264264
commit_message: Generating component snapshots
265265
file_pattern: .playwright/screenshots/**/*.png .playwright/screenshots/**/*.yml

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ demo/public/vite-test/
5454
demo/public/vite-dev/
5555
demo/public/vite/
5656
demo/app/assets/builds/
57+
File::NULL
5758

5859
# IDE folders
5960
.idea

0 commit comments

Comments
 (0)