Skip to content

Commit

Permalink
Merge pull request #365 from alphagov/merger-v2
Browse files Browse the repository at this point in the history
Upgrade to govuk-dependabot-merger v2
  • Loading branch information
MuriloDalRi authored Apr 16, 2024
2 parents 706b77f + b3f90c9 commit 4075767
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@
/spec/reports/
/tmp/
spec/examples.txt
# simplecov
coverage/
14 changes: 4 additions & 10 deletions .govuk_dependabot_merger.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
api_version: 1
auto_merge:
- dependency: rubocop-govuk
allowed_semver_bumps:
- patch
- minor
- dependency: plek
allowed_semver_bumps:
- patch
- minor
api_version: 2
defaults:
auto_merge: true
update_external_dependencies: true
1 change: 1 addition & 0 deletions govuk_app_config.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,6 @@ Gem::Specification.new do |spec|
spec.add_development_dependency "rspec", "~> 3.10"
spec.add_development_dependency "rspec-its", "~> 1.3"
spec.add_development_dependency "rubocop-govuk", "4.16.1"
spec.add_development_dependency "simplecov"
spec.add_development_dependency "webmock"
end
2 changes: 2 additions & 0 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
require "byebug"
require "climate_control"
require "rspec/its"
require "simplecov"
require "webmock/rspec"
SimpleCov.start

RSpec.configure do |config|
config.include(ActiveSupport::Testing::TimeHelpers)
Expand Down

0 comments on commit 4075767

Please sign in to comment.