Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AO3-6674 Upgrade gems and config to Rails 7.0 #4727

Merged
merged 29 commits into from
May 4, 2024
Merged

AO3-6674 Upgrade gems and config to Rails 7.0 #4727

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
d14e72b
Initial migration (gem update, script)
brianjaustin Jan 27, 2024
0477626
Fix bugs/deprecation warnings
brianjaustin Jan 27, 2024
1067ceb
Enable some safer new defaults
brianjaustin Jan 27, 2024
dc3a40f
Cookie rotator
brianjaustin Jan 27, 2024
b33bbec
Fix tests
brianjaustin Jan 27, 2024
599bac6
Fix tests try 2
brianjaustin Jan 28, 2024
2440897
Fix tests try 3
brianjaustin Jan 28, 2024
5efe404
Fix tests try 4
brianjaustin Jan 28, 2024
edd8ae1
Fix email test issue
brianjaustin Jan 28, 2024
58a00e1
Fix some form IDs/names
brianjaustin Jan 28, 2024
fa0002f
More fixes (not everything though)
brianjaustin Jan 28, 2024
285f321
Neither field IDs nor emails are my friend
brianjaustin Jan 29, 2024
3b15799
Merge upstream
brianjaustin Jan 29, 2024
f0063ea
I disagree with Rubocop here
brianjaustin Jan 29, 2024
df0ffd6
Merge branch 'master' into chore/rails-7
brianjaustin Feb 3, 2024
615e082
Add back tests for JS thing
brianjaustin Feb 24, 2024
fbc61ed
Merge upstream
brianjaustin Feb 24, 2024
8db5278
Merge upstream
brianjaustin Mar 5, 2024
c19d59a
Fix tests by i18n-ing
brianjaustin Mar 5, 2024
08dae9f
Change cache key with version bumps
brianjaustin Mar 26, 2024
c93df5e
Merge upstream
brianjaustin Mar 26, 2024
adb55a1
Remove default from t helper
brianjaustin Mar 29, 2024
fa19da6
More cleanup
brianjaustin Mar 29, 2024
7c2fba3
Merge branch 'master' into chore/rails-7
brianjaustin Apr 4, 2024
5513d12
Merge upstream
brianjaustin Apr 8, 2024
127a4af
I rather dislike Gemfile.lock merges...
brianjaustin Apr 8, 2024
f644b29
Remove another duplicate key
brianjaustin Apr 8, 2024
43313b1
Use full i18n keys due to flash weirdness
brianjaustin Apr 9, 2024
e026a09
Fix typo
brianjaustin Apr 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/automated-tests.yml
View file
Open in desktop
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
6 changes: 2 additions & 4 deletions Gemfile
View file
Open in desktop
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 @@ -137,7 +136,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"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A newer version of this is required to work with Cucumber, which is forcing its way in along with all the other things that need upgrading to support Rails 7. It also seemed like a good idea to just grab the newest since we're quite out of date

gem "webmock"
gem 'timecop'
gem 'cucumber-timecop', require: false
Expand All @@ -155,7 +154,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
Loading