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

Upgrade Rails to 7.1.2 and fix signed_id error #135

Merged
53 changes: 31 additions & 22 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
PATH
remote: .
specs:
administrate-field-active_storage (0.3.8)
administrate-field-active_storage (0.4.1)
administrate (>= 0.2.2)
rails (>= 6.0)
rails (>= 7.0)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -67,26 +67,23 @@ GEM
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
administrate (0.16.0)
administrate (0.19.0)
actionpack (>= 5.0)
actionview (>= 5.0)
activerecord (>= 5.0)
datetime_picker_rails (~> 0.0.7)
jquery-rails (>= 4.0)
kaminari (>= 1.0)
momentjs-rails (~> 2.8)
sassc-rails (~> 2.1)
selectize-rails (~> 0.6)
ast (2.4.2)
builder (3.2.4)
concurrent-ruby (1.1.9)
crass (1.0.6)
datetime_picker_rails (0.0.7)
momentjs-rails (>= 2.8.1)
date (3.3.4)
erubi (1.10.0)
ffi (1.15.4)
globalid (1.0.0)
activesupport (>= 5.0)
ffi (1.16.3)
globalid (1.2.1)
activesupport (>= 6.1)
highline (2.0.3)
i18n (1.8.11)
concurrent-ruby (~> 1.0)
Expand All @@ -100,7 +97,7 @@ GEM
rails-i18n
rainbow (>= 2.2.2, < 4.0)
terminal-table (>= 1.5.1)
jquery-rails (4.4.0)
jquery-rails (4.6.0)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
Expand All @@ -119,18 +116,28 @@ GEM
loofah (2.13.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mail (2.8.1)
mini_mime (>= 0.1.1)
net-imap
net-pop
net-smtp
marcel (1.0.2)
method_source (1.0.0)
mini_mime (1.1.2)
mini_mime (1.1.5)
mini_portile2 (2.8.5)
minitest (5.15.0)
momentjs-rails (2.29.1)
railties (>= 3.1)
nio4r (2.5.8)
nokogiri (1.13.3-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.13.3-x86_64-linux)
net-imap (0.4.5)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.2.2)
timeout
net-smtp (0.4.0)
net-protocol
nio4r (2.6.0)
nokogiri (1.13.3)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
parser (3.0.3.2)
ast (~> 2.4.1)
Expand Down Expand Up @@ -178,7 +185,7 @@ GEM
sprockets-rails
tilt
selectize-rails (0.12.6)
sprockets (4.0.2)
sprockets (4.1.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.4.2)
Expand All @@ -189,16 +196,18 @@ GEM
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
thor (1.1.0)
tilt (2.0.10)
tilt (2.3.0)
timeout (0.4.1)
tzinfo (2.0.4)
concurrent-ruby (~> 1.0)
unicode-display_width (2.1.0)
websocket-driver (0.7.5)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
zeitwerk (2.5.2)

PLATFORMS
arm64-darwin-21
x86_64-darwin-20
x86_64-linux

Expand Down
10 changes: 6 additions & 4 deletions app/views/fields/active_storage/_item.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,17 @@ controlled via a boolean local variable.
[x, y]
Maximum size of the ActiveStorage preview.
%>
<% if field.show_display_preview? %>
<% if field.show_display_preview? && attachment.persisted? %>
<div>
<%= render partial: 'fields/active_storage/preview', locals: local_assigns %>
</div>
<% end %>

<div>
<%= link_to attachment.filename, field.blob_url(attachment), title: attachment.filename %>
</div>
<% if attachment.persisted? %>
<div>
<%= link_to attachment.filename, field.blob_url(attachment), title: attachment.filename %>
</div>
<% end %>

<% if field.destroy_url.present? %>
<% destroy_url = field.destroy_url.call(namespace, field.data.record, attachment) %>
Expand Down
1 change: 1 addition & 0 deletions contribute.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@
- Jazzy Gasper [@jazzygasper](https://github.com/jazzygasper)
- David Ma [@taikon](https://github.com/taikon)
- Dmitry Davydov [@haukot](https://github.com/haukot)
- Jeanine Soterwood [@littleforest](https://github.com/littleforest)
4 changes: 2 additions & 2 deletions test_app/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
ruby '3.0.3'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails'
gem 'rails', '7.1.2'
# Use sqlite3 as the database for Active Record
gem 'sqlite3', '~> 1.4'
# Use Puma as the app server
Expand All @@ -15,7 +15,7 @@ gem 'sass-rails', '>= 6'
# gem 'bcrypt', '~> 3.1.7'

# Use Active Storage variant
# gem 'image_processing', '~> 1.2'
gem 'image_processing', '~> 1.2'

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
Expand Down
Loading
Loading