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
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ group :test do
gem 'rubocop', '~> 1.88.1'
gem 'rubocop-capybara'
gem 'rubocop-factory_bot'
gem 'rubocop-rails', '~> 2.34'
gem 'rubocop-rails', '~> 2.36'
gem 'rubocop-rspec', '~> 3.10'
gem 'rubocop-rspec_rails'
gem 'rubocop-sequel', '~> 0.4.1'
Expand Down
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ GEM
rdoc (>= 4.0.0)
reline (>= 0.4.2)
jaro_winkler (1.7.0)
json (2.20.0)
json (2.21.1)
json-diff (0.4.1)
json-schema (6.2.0)
addressable (~> 2.8)
Expand Down Expand Up @@ -342,7 +342,7 @@ GEM
rubocop-factory_bot (2.28.0)
lint_roller (~> 1.1)
rubocop (~> 1.72, >= 1.72.1)
rubocop-rails (2.34.3)
rubocop-rails (2.36.0)
activesupport (>= 4.2.0)
lint_roller (~> 1.1)
rack (>= 1.1)
Expand Down Expand Up @@ -519,7 +519,7 @@ DEPENDENCIES
rubocop (~> 1.88.1)
rubocop-capybara
rubocop-factory_bot
rubocop-rails (~> 2.34)
rubocop-rails (~> 2.36)
rubocop-rspec (~> 3.10)
rubocop-rspec_rails
rubocop-sequel (~> 0.4.1)
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/base/model_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ def run_or_enqueue_deletion_job(deletion_job)
def enumerate
validate_access(:index, model)

if params.key?('order-by') && self.class.sortable_parameters.exclude?(params['order-by'].to_sym)
if params.key?('order-by') && self.class.sortable_parameters.exclude?(params.fetch('order-by').to_sym)
raise CloudController::Errors::ApiError.new_from_details('OrderByParameterInvalid',
params['order-by'])
params.fetch('order-by'))
end

collection_renderer.render_json(
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/v3/sidecars_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def create
end

def update
sidecar = SidecarModel.find(guid: params[:guid])
sidecar = SidecarModel.find(guid: hashed_params[:guid])

resource_not_found!(:sidecar) unless sidecar
space = sidecar.app.space
Expand Down
Loading