Skip to content

Commit c0b2743

Browse files
committed
Merge branch 'use_head_commit' into misc/davida/bump-gems
Conflicts: Dockerfile Gemfile.lock action.yml
2 parents c36e5aa + a71cfd4 commit c0b2743

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

Gemfile.lock

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
GIT
2+
remote: https://github.com/storypark/pronto-brakeman.git
3+
revision: dff26bfe31930f987a5ee72e99d18a6cdc91d40c
4+
specs:
5+
pronto-brakeman (0.11.2.pre.1)
6+
brakeman (>= 3.2.0)
7+
pronto (~> 0.11.0)
8+
19
GEM
210
remote: https://rubygems.org/
311
specs:
@@ -32,6 +40,8 @@ GEM
3240
parser (>= 2.4)
3341
smart_properties
3442
bigdecimal (3.1.9)
43+
brakeman (7.0.0)
44+
racc
3545
builder (3.3.0)
3646
bundler-audit (0.9.2)
3747
bundler (>= 1.2.0, < 3)
@@ -301,6 +311,7 @@ PLATFORMS
301311
DEPENDENCIES
302312
climate_control
303313
pronto
314+
pronto-brakeman!
304315
pronto-bundler_audit
305316
pronto-erb_lint
306317
pronto-eslint_npm

action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ inputs:
1818
description: >-
1919
The git object to diff against when running pronto. Use this if you have a
2020
specific branch you'd like to always use as a target for the diff to be reviewed
21-
and that branch is not master. This defaults to origin/master or the target
21+
and that branch is not main. This defaults to origin/main or the target
2222
of the pull request being opened (when the event is pull_request).
2323
required: false
2424
default: >-
25-
origin/master
25+
origin/main
2626
runs:
2727
using: docker
28-
image: "docker://ghcr.io/apptweak/pronto-ruby:adapted"
28+
image: "docker://ghcr.io/apptweak/pronto-ruby:use_head_commit"
2929
args:
3030
- run
3131
- -r

0 commit comments

Comments
 (0)