Skip to content

Commit 7f90581

Browse files
authored
Merge branch 'cloudfoundry:main' into cve-98958-rack
2 parents a497281 + 1264fff commit 7f90581

File tree

76 files changed

+1101
-571
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+1101
-571
lines changed

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969

7070
# Initializes the CodeQL tools for scanning.
7171
- name: Initialize CodeQL
72-
uses: github/codeql-action/init@v3
72+
uses: github/codeql-action/init@v4
7373
with:
7474
languages: ${{ matrix.language }}
7575
build-mode: ${{ matrix.build-mode }}
@@ -97,6 +97,6 @@ jobs:
9797
exit 1
9898
9999
- name: Perform CodeQL Analysis
100-
uses: github/codeql-action/analyze@v3
100+
uses: github/codeql-action/analyze@v4
101101
with:
102102
category: "/language:${{matrix.language}}"

.rubocop_cc.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,12 +143,16 @@ Rails/SkipsModelValidations: # We don`t want any model at all in migrations and
143143
- spec/migrations/**/*
144144

145145
#### ENABLED SECTION
146+
Gemspec/AttributeAssignment:
147+
Enabled: true
146148
Gemspec/DeprecatedAttributeAssignment:
147149
Enabled: true
148150
Gemspec/DevelopmentDependencies:
149151
Enabled: true
150152
Gemspec/RequireMFA:
151153
Enabled: true
154+
Layout/EmptyLinesAfterModuleInclusion:
155+
Enabled: true
152156
Layout/LineContinuationLeadingSpace:
153157
Enabled: true
154158
Layout/LineContinuationSpacing:
@@ -239,8 +243,12 @@ Lint/UnexpectedBlockArity:
239243
Enabled: true
240244
Lint/UnmodifiedReduceAccumulator:
241245
Enabled: true
246+
Lint/UselessDefaultValueArgument:
247+
Enabled: true
242248
Lint/UselessDefined:
243249
Enabled: true
250+
Lint/UselessOr:
251+
Enabled: true
244252
Lint/UselessRescue:
245253
Enabled: true
246254
Lint/UselessRuby2Keywords:
@@ -259,6 +267,8 @@ Style/ArgumentsForwarding:
259267
Enabled: true
260268
Style/ArrayIntersect:
261269
Enabled: true
270+
Style/ArrayIntersectWithSingleElement:
271+
Enabled: true
262272
Style/BitwisePredicate:
263273
Enabled: true
264274
Style/CollectionCompact:
@@ -281,6 +291,8 @@ Style/DocumentDynamicEvalDefinition:
281291
Enabled: true
282292
Style/EmptyHeredoc:
283293
Enabled: true
294+
Style/EmptyStringInsideInterpolation:
295+
Enabled: true
284296
Style/EndlessMethod:
285297
Enabled: true
286298
Style/EnvHome:
@@ -349,6 +361,8 @@ Style/RedundantArgument:
349361
Enabled: true
350362
Style/RedundantArrayConstructor:
351363
Enabled: true
364+
Style/RedundantArrayFlatten:
365+
Enabled: true
352366
Style/RedundantConstantBase:
353367
Enabled: true
354368
Style/RedundantCurrentDirectoryInPath:
@@ -425,6 +439,8 @@ Rails/ExpandedDateRange:
425439
Enabled: true
426440
Rails/FindById:
427441
Enabled: true
442+
Rails/FindByOrAssignmentMemoization:
443+
Enabled: true
428444
Rails/FreezeTime:
429445
Enabled: true
430446
Rails/I18nLazyLookup:
@@ -447,6 +463,8 @@ Rails/MultipleRoutePaths:
447463
Enabled: true
448464
Rails/NegateInclude:
449465
Enabled: true
466+
Rails/OrderArguments:
467+
Enabled: true
450468
Rails/Pluck:
451469
Enabled: true
452470
Rails/PluckInWhere:

.rubocop_todo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ Naming/HeredocDelimiterNaming:
129129
# ForbiddenPrefixes: is_, has_, have_
130130
# AllowedMethods: is_a?
131131
# MethodDefinitionMacros: define_method, define_singleton_method
132-
Naming/PredicateName:
132+
Naming/PredicatePrefix:
133133
Enabled: false
134134

135135
# Offense count: 862

Gemfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ gem 'rack', '~> 2.2.20'
3333
gem 'rake'
3434
gem 'redis'
3535
gem 'rubyzip', '>= 1.3.0'
36-
gem 'sequel', '~> 5.95'
36+
gem 'sequel', '~> 5.97'
3737
gem 'sequel_pg', require: 'sequel'
3838
gem 'sinatra', '~> 3.2'
3939
gem 'sinatra-contrib'
@@ -46,25 +46,25 @@ gem 'uri', '~> 1.0'
4646
gem 'vmstat', '~> 2.3'
4747

4848
# Rails Components
49-
gem 'actionpack', '~> 8.0.2'
49+
gem 'actionpack', '~> 8.0.3'
5050
gem 'actionview', '~> 8.0.1'
5151
gem 'activemodel', '~> 8.0.2'
52-
gem 'railties', '~> 8.0.1'
52+
gem 'railties', '~> 8.0.3'
5353

5454
gem 'azure-storage-blob', git: 'https://github.com/sethboyles/azure-storage-ruby.git', branch: 'x-ms-blob-content-type-fix-1.1'
5555

5656
gem 'fog-aliyun'
5757
gem 'fog-aws'
5858
gem 'fog-azure-rm', git: 'https://github.com/fog/fog-azure-rm.git', branch: 'fog-arm-cf'
5959
gem 'fog-core', '~> 2.6.0'
60-
gem 'fog-google', '~> 1.25.0'
60+
gem 'fog-google', '~> 1.26.0'
6161
gem 'fog-local'
6262
gem 'fog-openstack'
6363

6464
gem 'cf-uaa-lib', '~> 4.0.9'
6565

6666
group :db do
67-
gem 'mysql2', '~> 0.5.6'
67+
gem 'mysql2', '~> 0.5.7'
6868
gem 'pg'
6969
end
7070

@@ -85,11 +85,11 @@ group :test do
8585
gem 'rspec-its'
8686
gem 'rspec-rails', '~> 8.0.2'
8787
gem 'rspec-wait'
88-
gem 'rubocop', '~> 1.80.0'
88+
gem 'rubocop', '~> 1.81.1'
8989
gem 'rubocop-capybara'
9090
gem 'rubocop-factory_bot'
9191
gem 'rubocop-rails', '~> 2.33'
92-
gem 'rubocop-rspec', '~> 3.6'
92+
gem 'rubocop-rspec', '~> 3.7'
9393
gem 'rubocop-rspec_rails'
9494
gem 'rubocop-sequel', '~> 0.4.1'
9595
gem 'timecop'

0 commit comments

Comments
 (0)