Skip to content

Commit

Permalink
Merge branch 'master' into AO3-6712
Browse files Browse the repository at this point in the history
  • Loading branch information
weeklies authored May 13, 2024
2 parents 02b8fe0 + 71d6d4d commit faf28e6
Show file tree
Hide file tree
Showing 90 changed files with 1,162 additions and 712 deletions.
1 change: 1 addition & 0 deletions .github/workflows/automated-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jobs:
TEST_GROUP: ${{ matrix.tests.command }} ${{ matrix.tests.arguments }}
CUCUMBER_RETRY: 1
CUCUMBER_FORMAT: Ao3Cucumber::Formatter
CUCUMBER_PUBLISH_QUIET: true
SPEC_OPTS: --force-color

services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reviewdog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
bundler-cache: true

- name: rubocop
uses: reviewdog/action-rubocop@2c8048e3169487eccc1eed812daaa6e5275a809f
uses: reviewdog/action-rubocop@708a61f1f3bc4127205f5ec59f4f8617478ebdda
with:
use_bundler: true
reporter: github-pr-check
Expand Down
6 changes: 2 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ gem 'test-unit', '~> 3.2'

gem 'bundler'

gem "rails", "~> 6.1.7"

gem "rails", "~> 7.0.8"
gem "rails-i18n"
gem "rack", "~> 2.2"
gem "sprockets", "< 4"
Expand Down Expand Up @@ -136,7 +135,7 @@ group :test do
gem 'launchy' # So you can do Then show me the page

# Record and replay data from external URLs
gem 'vcr', '~> 3.0', '>= 3.0.1'
gem "vcr", "~> 6.2"
gem "webmock"
gem 'timecop'
gem 'cucumber-timecop', require: false
Expand All @@ -154,7 +153,6 @@ group :test, :development do
gem 'whiny_validation'
gem "factory_bot_rails"
gem 'minitest'
gem "listen", "~> 3.3"
gem "i18n-tasks", require: false
end

Expand Down
Loading

0 comments on commit faf28e6

Please sign in to comment.