Skip to content

Commit d3809a4

Browse files
authored
Merge branch 'develop' into art/1639/audit-logs
2 parents adfdde8 + a632a47 commit d3809a4

3 files changed

Lines changed: 4 additions & 39 deletions

File tree

.github/workflows/ci-cd.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ jobs:
106106
path: tmp/screenshots
107107
if-no-files-found: ignore
108108
- uses: codecov/codecov-action@v5
109-
if: ${{ matrix.ruby_version == 3.2 && matrix.test_type == 'test' }}
109+
if: ${{ matrix.ruby_version == 3.2 && matrix.test_type == 'test' && github.actor != 'dependabot[bot]' }}
110110
with:
111111
directory: coverage
112112
fail_ci_if_error: true
@@ -116,7 +116,7 @@ jobs:
116116
deploy:
117117
name: Dev server deployment
118118
runs-on: ubuntu-latest
119-
if: ${{ github.event_name == 'push' }}
119+
if: ${{ github.event_name == 'push' && github.actor != 'dependabot[bot]' }}
120120
needs:
121121
- rubocop
122122
- typescript

.github/workflows/codeql-analysis.yml

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

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ GEM
248248
net-smtp (0.5.1)
249249
net-protocol
250250
nio4r (2.7.4)
251-
nokogiri (1.18.8)
251+
nokogiri (1.18.9)
252252
mini_portile2 (~> 2.8.2)
253253
racc (~> 1.4)
254254
observer (0.1.2)
@@ -421,7 +421,7 @@ GEM
421421
tins (~> 1.0)
422422
terser (1.2.6)
423423
execjs (>= 0.3.0, < 3)
424-
thor (1.3.2)
424+
thor (1.4.0)
425425
thwait (0.2.0)
426426
e2mmap
427427
tilt (2.6.1)

0 commit comments

Comments
 (0)