Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 18 additions & 18 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
action_text-trix (2.1.18)
action_text-trix (2.1.19)
railties
actioncable (8.1.3)
actionpack (= 8.1.3)
Expand Down Expand Up @@ -104,7 +104,7 @@ GEM
benchmark (0.5.0)
bigdecimal (4.1.2)
bindex (0.8.1)
bootsnap (1.24.1)
bootsnap (1.24.3)
msgpack (~> 1.2)
bootstrap_form (5.6.1)
actionpack (>= 7.2)
Expand Down Expand Up @@ -160,14 +160,14 @@ GEM
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
device_detector (1.1.3)
devise (5.0.3)
devise (5.0.4)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 7.0)
responders
warden (~> 1.2.3)
devise-bootstrap-views (1.1.0)
devise_invitable (2.0.11)
devise_invitable (2.0.12)
actionmailer (>= 5.0)
devise (>= 4.6)
diff-lcs (1.6.2)
Expand All @@ -186,12 +186,12 @@ GEM
erubi (1.13.1)
et-orbi (1.4.0)
tzinfo
factory_bot (6.5.6)
factory_bot (6.6.0)
activesupport (>= 6.1.0)
factory_bot_rails (6.5.1)
factory_bot (~> 6.5)
railties (>= 6.1.0)
friendly_id (5.6.0)
friendly_id (5.7.0)
activerecord (>= 4.0.0)
fugit (1.12.1)
et-orbi (~> 1.4)
Expand All @@ -210,7 +210,7 @@ GEM
herb (0.10.1-x86_64-linux-musl)
highline (3.1.2)
reline
honeybadger (6.5.5)
honeybadger (6.6.0)
logger
ostruct
http (6.0.3)
Expand Down Expand Up @@ -331,7 +331,7 @@ GEM
benchmark
orm_adapter (0.5.0)
ostruct (0.6.3)
ox (2.14.25)
ox (2.14.26)
bigdecimal (>= 3.0)
paper_trail (17.0.0)
activerecord (>= 7.1)
Expand Down Expand Up @@ -417,7 +417,7 @@ GEM
tsort
redis (5.4.1)
redis-client (>= 0.22.0)
redis-client (0.28.0)
redis-client (0.29.0)
connection_pool
regexp_parser (2.12.0)
reline (0.6.3)
Expand Down Expand Up @@ -470,7 +470,7 @@ GEM
lint_roller (~> 1.1)
rubocop (>= 1.75.0, < 2.0)
rubocop-ast (>= 1.47.1, < 2.0)
rubocop-rails (2.34.3)
rubocop-rails (2.35.0)
activesupport (>= 4.2.0)
lint_roller (~> 1.1)
rack (>= 1.1)
Expand Down Expand Up @@ -506,13 +506,13 @@ GEM
fugit (~> 1.11)
railties (>= 7.1)
thor (>= 1.3.1)
sqlite3 (2.9.3-aarch64-linux-gnu)
sqlite3 (2.9.3-aarch64-linux-musl)
sqlite3 (2.9.3-arm-linux-gnu)
sqlite3 (2.9.3-arm-linux-musl)
sqlite3 (2.9.3-arm64-darwin)
sqlite3 (2.9.3-x86_64-linux-gnu)
sqlite3 (2.9.3-x86_64-linux-musl)
sqlite3 (2.9.4-aarch64-linux-gnu)
sqlite3 (2.9.4-aarch64-linux-musl)
sqlite3 (2.9.4-arm-linux-gnu)
sqlite3 (2.9.4-arm-linux-musl)
sqlite3 (2.9.4-arm64-darwin)
sqlite3 (2.9.4-x86_64-linux-gnu)
sqlite3 (2.9.4-x86_64-linux-musl)
sshkit (1.25.0)
base64
logger
Expand Down Expand Up @@ -544,7 +544,7 @@ GEM
unicode-emoji (4.2.0)
uri (1.1.1)
useragent (0.16.11)
view_component (4.8.0)
view_component (4.9.0)
actionview (>= 7.1.0)
activesupport (>= 7.1.0)
concurrent-ruby (~> 1)
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/organization_users_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ def destroy
end

def load_user
@user = User.find(params[:id]) || User.new
@user = User.find(params.expect(:id)) || User.new
end
end
2 changes: 1 addition & 1 deletion app/controllers/proxy_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class ProxyController < ActiveStorage::BaseController

# rubocop:disable Metrics/AbcSize
def show
attachment = ActiveStorage::Attachment.find(params[:id])
attachment = ActiveStorage::Attachment.find(params.expect(:id))
authorize!(:read, attachment)
add_analytics_event(attachment)

Expand Down
2 changes: 1 addition & 1 deletion app/controllers/streams_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def normalized_dump
end

def make_pending_default
@stream = @organization.streams.find(params[:stream])
@stream = @organization.streams.find(params.expect(:stream))
authorize!(:update, @stream)

@stream.make_pending
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/uploads_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def destroy
def info
authorize! :read, @upload

@attachment = @upload.files.find(params[:attachment_id])
@attachment = @upload.files.find(params.expect(:attachment_id))
@blob = @attachment.blob
end

Expand Down