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.

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
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Fix bugs/deprecation warnings
  • Loading branch information
brianjaustin committed Jan 27, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 047762667dbf07ab5f74949e46f8777a50f41f4c
2 changes: 1 addition & 1 deletion app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
class ApplicationController < ActionController::Base
include Pundit
include Pundit::Authorization
Copy link
Member Author

Choose a reason for hiding this comment

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

Got a warning message in the log output about Pundit without this being deprecated, drop-in replacement seems to work in tests and local dev

protect_from_forgery with: :exception, prepend: true
rescue_from ActionController::InvalidAuthenticityToken, with: :display_auth_error

8 changes: 0 additions & 8 deletions app/helpers/application_helper.rb
Original file line number Diff line number Diff line change
@@ -343,14 +343,6 @@ def name_to_id(name)
name.to_s.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "")
end

def field_id(form, attribute)
name_to_id(field_name(form, attribute))
end

def field_name(form, attribute)
"#{form.object_name}[#{field_attribute(attribute)}]"
end

# toggle an checkboxes (scrollable checkboxes) section of a form to show all of the checkboxes
def checkbox_section_toggle(checkboxes_id, checkboxes_size, options = {})
toggle_show = content_tag(:a, ts("Expand %{checkboxes_size} Checkboxes", checkboxes_size: checkboxes_size),