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 @@ -83,7 +83,7 @@ group :test do
gem 'rspec-its'
gem 'rspec-rails', '~> 7.1.1'
gem 'rspec-wait'
gem 'rubocop', '~> 1.75.2'
gem 'rubocop', '~> 1.75.3'
gem 'rubocop-capybara'
gem 'rubocop-factory_bot'
gem 'rubocop-rails', '~> 2.31'
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ GEM
activesupport (>= 3.0.0)
mustache (~> 1.0, >= 0.99.4)
rspec (~> 3.0)
rubocop (1.75.2)
rubocop (1.75.3)
json (~> 2.3)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.1.0)
Expand Down Expand Up @@ -671,7 +671,7 @@ DEPENDENCIES
rspec-rails (~> 7.1.1)
rspec-wait
rspec_api_documentation (>= 6.1.0)
rubocop (~> 1.75.2)
rubocop (~> 1.75.3)
rubocop-capybara
rubocop-factory_bot
rubocop-rails (~> 2.31)
Expand Down
2 changes: 1 addition & 1 deletion app/presenters/v3/droplet_presenter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def droplet_buildpack_info
name_to_lookup = buildpack.buildpack_url
name_to_print = CloudController::UrlSecretObfuscator.obfuscate(buildpack.buildpack_url)
end
detect_output = droplet.buildpack_receipt_buildpack == (name_to_lookup) ? droplet.buildpack_receipt_detect_output : nil
detect_output = droplet.buildpack_receipt_buildpack == name_to_lookup ? droplet.buildpack_receipt_detect_output : nil
{
name: name_to_print,
detect_output: detect_output,
Expand Down
4 changes: 2 additions & 2 deletions lib/cloud_controller/diego/app_recipe_builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,8 @@ def generate_routes(info)

{
CF_ROUTES_KEY => Oj.dump(http_routes),
TCP_ROUTES_KEY => Oj.dump((info['tcp_routes'] || [])),
INTERNAL_ROUTES_KEY => Oj.dump((info['internal_routes'] || []))
TCP_ROUTES_KEY => Oj.dump(info['tcp_routes'] || []),
INTERNAL_ROUTES_KEY => Oj.dump(info['internal_routes'] || [])
}
end

Expand Down
4 changes: 2 additions & 2 deletions spec/logcache/container_metric_batcher_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ def generate_batch(size, offset: 0, last_timestamp: TimeUtils.to_nanoseconds(Tim
Timecop.freeze do
subject

start_time = TimeUtils.to_nanoseconds((Time.now - lookback_window))
start_time = TimeUtils.to_nanoseconds(Time.now - lookback_window)
end_time = TimeUtils.to_nanoseconds(Time.now)
expect(wrapped_logcache_client).to have_received(:container_metrics).
with(hash_including(start_time:, end_time:))
Expand Down Expand Up @@ -545,7 +545,7 @@ def generate_batch(size, offset: 0, last_timestamp: TimeUtils.to_nanoseconds(Tim
Timecop.freeze(call_time) do
expect(subject).to have(2001).items

start_time = TimeUtils.to_nanoseconds((call_time - lookback_window))
start_time = TimeUtils.to_nanoseconds(call_time - lookback_window)
expect(wrapped_logcache_client).to have_received(:container_metrics).
with(hash_including(start_time: start_time, end_time: call_time_ns))

Expand Down
2 changes: 1 addition & 1 deletion spec/support/legacy_api_dsl.rb
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ def standard_list_parameters(controller, outer_model: nil, exclude_parameters: [
query_parameter_description += 'Format queries as &lt;filter&gt;&lt;op&gt;&lt;value&gt;<br/>'
query_parameter_description += ' Valid ops: : &gt;= &lt;= &lt; &gt; IN<br/>'
query_parameter_description += " Valid filters: #{query_parameters.to_a.join(', ')}"
if outer_model && query_parameters.include?((outer_model.to_s + '_guid'))
if outer_model && query_parameters.include?(outer_model.to_s + '_guid')
query_parameter_description += "<br/> (Note that filtering on #{outer_model}_guid will return an empty list " \
'if you specify anything other than the guid included in the path.)'
end
Expand Down
Loading