Skip to content

Commit

Permalink
Merge branch 'main' into markdownlint
Browse files Browse the repository at this point in the history
  • Loading branch information
wwahammy committed Aug 17, 2023
2 parents abc2e71 + 761541d commit ba0b222
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ group :ci, :test do
gem 'database_cleaner-active_record'
gem 'stripe-ruby-mock', '~> 2.4.1', require: 'stripe_mock', git: 'https://github.com/commitchange/stripe-ruby-mock.git', branch: '2.4.1'
gem 'test-unit', '~> 3.6'
gem 'timecop', '~> 0.9.6'
gem 'timecop', '~> 0.9.8'
gem 'webmock', '~> 3.18'
gem 'wisper-rspec', '~> 1.1.0'
end
Expand Down
8 changes: 4 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ GEM
raabro (~> 1.4)
globalid (1.1.0)
activesupport (>= 5.0)
good_job (3.17.0)
good_job (3.17.2)
activejob (>= 6.0.0)
activerecord (>= 6.0.0)
concurrent-ruby (>= 1.0.2)
Expand Down Expand Up @@ -278,7 +278,7 @@ GEM
net-protocol
netrc (0.11.0)
nio4r (2.5.9)
nokogiri (1.15.3)
nokogiri (1.15.4)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
orm_adapter (0.5.0)
Expand Down Expand Up @@ -440,7 +440,7 @@ GEM
power_assert
thor (1.2.2)
tilt (2.0.10)
timecop (0.9.6)
timecop (0.9.8)
timeout (0.4.0)
timers (4.3.3)
traceroute (0.8.1)
Expand Down Expand Up @@ -538,7 +538,7 @@ DEPENDENCIES
stripe-ruby-mock (~> 2.4.1)!
table_print (~> 1.5, >= 1.5.6)
test-unit (~> 3.6)
timecop (~> 0.9.6)
timecop (~> 0.9.8)
traceroute (~> 0.8.0)
turbo_test
validate_url
Expand Down

0 comments on commit ba0b222

Please sign in to comment.