Skip to content

Commit 787c090

Browse files
authored
Merge branch 'dev' into merge-release/17.3-20260421043240
2 parents 68286ab + 15ae3ef commit 787c090

1,768 files changed

Lines changed: 42565 additions & 32870 deletions

File tree

Some content is hidden

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

.buildpacks

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
https://github.com/heroku/heroku-buildpack-nodejs.git#v315
2-
https://github.com/pkgr/heroku-buildpack-ruby.git#v327-1
2+
https://github.com/pkgr/heroku-buildpack-ruby.git#v356-1

.github/workflows/cla.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ jobs:
2121
if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
2222
uses: contributor-assistant/github-action@v2.6.1
2323
env:
24+
# https://github.com/contributor-assistant/github-action?tab=readme-ov-file#environmental-variables
25+
# Built-in GitHub token to make the API calls for interacting with GitHub. Does not need to be specified the secrets store.
2426
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
27+
# Access token for repository where the signatures are stored (see below for remote-repository-name)
2528
PERSONAL_ACCESS_TOKEN: ${{ secrets.OPENPROJECTCI_GH_LEGAL_TOKEN }}
2629
with:
2730
path-to-signatures: "contributor-license-agreement/signatures/version1.json"

.github/workflows/crowdin.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,14 @@ jobs:
7676
crowdin_branch_name: ${{ steps.vars.outputs.crowdin_branch }}
7777
# Dont create a PR for the updated translations
7878
push_translations: false
79+
user: auto
7980
env:
8081
OPENPROJECT_CROWDIN_PROJECT: ${{ secrets.OPENPROJECT_CROWDINV2_PROJECT }}
8182
OPENPROJECT_CROWDIN_API_KEY: ${{ secrets.OPENPROJECT_CROWDINV2_API_KEY }}
8283
- name: "Fix root key in Portuguese crowdin translation files"
83-
run: |
84-
script/i18n/fix_crowdin_pt_language_root_key
84+
run: script/i18n/fix_crowdin_pt_language_root_key
85+
- name: "Rewrite crowdin translation files using ruby yaml library"
86+
run: script/i18n/rewrite_crowdin_yml_files
8587
- name: "Commit translations"
8688
env:
8789
BRANCH: ${{ matrix.branch }}

.rubocop.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,10 @@ Rails/ContentTag:
169169
# dynamic finders cop clashes with capybara ID cop
170170
Rails/DynamicFindBy:
171171
Enabled: true
172+
AllowedMethods:
173+
- find_by_id_or_identifier
174+
- find_by_id_or_identifier!
175+
- find_by_semantic_identifier
172176
Exclude:
173177
- "spec/features/**/*.rb"
174178
- "spec/support/**/*.rb"
@@ -186,6 +190,9 @@ Rails/FindEach:
186190
- limit
187191
- select
188192
- lock
193+
Exclude:
194+
- "spec/**/*"
195+
- "modules/**/spec/**/*"
189196

190197
# The http verbs in Rack::Test do not accept named parameters (params: params)
191198
Rails/HttpPositionalArguments:
@@ -197,11 +204,13 @@ Rails/I18nLocaleAssignment:
197204
Enabled: true
198205
Exclude:
199206
- "spec/**/*.rb"
207+
- "modules/*/spec/**/*.rb"
200208

201209
Rails/I18nLocaleTexts:
202210
Enabled: true
203211
Exclude:
204212
- "spec/**/*.rb"
213+
- "modules/*/spec/**/*.rb"
205214

206215
# We have config.active_record.belongs_to_required_by_default = false ,
207216
# which means, we do have to declare presence validators on belongs_to relations.
@@ -215,6 +224,9 @@ Rails/RequireDependency:
215224
# Require save! to prevent saving without validation when saving outside of a condition.
216225
Rails/SaveBang:
217226
Enabled: true
227+
Exclude:
228+
- "spec/**/*"
229+
- "modules/**/spec/**/*"
218230

219231
# There are valid cases in which to use methods like:
220232
# * update_all
@@ -321,6 +333,7 @@ RSpec/SpecFilePathFormat:
321333
CustomTransform:
322334
OpenIDConnect: openid_connect
323335
OAuthClients: oauth_clients
336+
XWikiProviders: xwiki_providers
324337
EnforcedInflector: active_support
325338
IgnoreMethods: true
326339

@@ -471,6 +484,11 @@ Style/Proc:
471484
Style/RaiseArgs:
472485
Enabled: false
473486

487+
Style/RescueModifier:
488+
Exclude:
489+
- "spec/**/*"
490+
- "modules/**/spec/**/*"
491+
474492
Style/RegexpLiteral:
475493
Enabled: false
476494

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0.1
1+
4.0.2

Gemfile

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ gem "activemodel-serializers-xml", "~> 1.0.1"
4141
gem "activerecord-import", "~> 2.2.0"
4242
gem "activerecord-session_store", "~> 2.2.0"
4343
gem "ox"
44-
gem "rails", "~> 8.1.2"
44+
gem "rails", "~> 8.1.3"
4545
gem "responders", "~> 3.2"
4646

47-
gem "ffi", "~> 1.15"
47+
gem "ffi", "~> 1.17"
4848

4949
gem "connection_pool", "~> 3.0.2"
5050

@@ -72,7 +72,7 @@ gem "awesome_nested_set", "~> 3.9.0"
7272
gem "closure_tree", "~> 9.6.1"
7373
gem "rubytree", "~> 2.2.0"
7474

75-
gem "addressable", "~> 2.8.9"
75+
gem "addressable", "~> 2.9.0"
7676

7777
# Remove whitespace from model input
7878
gem "auto_strip_attributes", "~> 2.5"
@@ -87,7 +87,7 @@ gem "htmldiff"
8787
gem "stringex", "~> 2.8.5"
8888

8989
# CommonMark markdown parser with GFM extension
90-
gem "commonmarker", "~> 2.7.0"
90+
gem "commonmarker", "~> 2.8.0"
9191

9292
# HTML pipeline for transformations on text formatter output
9393
# such as sanitization or additional features
@@ -123,11 +123,11 @@ gem "sys-filesystem", "~> 1.5.0", require: false
123123

124124
gem "bcrypt", "~> 3.1.22"
125125

126-
gem "multi_json", "~> 1.19.0"
126+
gem "multi_json", "~> 1.20.0"
127127
gem "oj", "~> 3.16.16"
128128

129129
gem "daemons"
130-
gem "good_job", "~> 4.13.3" # update should be done manually in sync with saas-openproject version.
130+
gem "good_job", "~> 4.14.2" # update should be done manually in sync with saas-openproject version.
131131

132132
gem "rack-protection", "~> 3.2.0"
133133

@@ -161,7 +161,7 @@ gem "ttfunk", "~> 1.7.0" # remove after https://github.com/prawnpdf/prawn/issues
161161
# prawn implicitly depends on matrix gem no longer in ruby core with 3.1
162162
gem "matrix", "~> 0.4.3"
163163

164-
gem "mcp", "~> 0.8.0"
164+
gem "mcp", "~> 0.10.0"
165165

166166
gem "meta-tags", "~> 2.23.0"
167167

@@ -204,9 +204,9 @@ gem "carrierwave_direct", "~> 3.0.0"
204204
gem "ssrf_filter", "~> 1.3"
205205
gem "fog-aws"
206206

207-
gem "aws-sdk-core", "~> 3.241"
207+
gem "aws-sdk-core", "~> 3.244"
208208
# File upload via fog + screenshots on travis
209-
gem "aws-sdk-s3", "~> 1.213"
209+
gem "aws-sdk-s3", "~> 1.217"
210210

211211
gem "openproject-token", "~> 8.8.2"
212212

@@ -227,7 +227,7 @@ gem "dry-validation"
227227
gem "store_attribute", "~> 2.0"
228228

229229
# Appsignal integration
230-
gem "appsignal", "~> 4.7", require: false
230+
gem "appsignal", "~> 4.8", require: false
231231

232232
# Yabeda integration
233233
gem "yabeda-activerecord"
@@ -236,11 +236,11 @@ gem "yabeda-puma-plugin"
236236
gem "yabeda-rails"
237237

238238
# opentelemetry
239-
gem "opentelemetry-exporter-otlp", "~> 0.32.0", require: false
239+
gem "opentelemetry-exporter-otlp", "~> 0.33.0", require: false
240240
gem "opentelemetry-instrumentation-all", "~> 0.91.0", require: false
241241
gem "opentelemetry-sdk", "~> 1.10", require: false
242242

243-
gem "view_component", "~> 4.5.0"
243+
gem "view_component", "~> 4.6.0"
244244
# Lookbook
245245
gem "lookbook", "2.3.14"
246246

@@ -254,7 +254,7 @@ gem "factory_bot_rails", "~> 6.5.0", require: false
254254
gem "turbo_power", "~> 0.7.0"
255255
gem "turbo-rails", "~> 2.0.20"
256256

257-
gem "httpx", "~> 1.7.4"
257+
gem "httpx", "~> 1.7.5"
258258

259259
# Brings actual deep-freezing to most ruby objects
260260
gem "ice_nine"
@@ -266,7 +266,7 @@ group :test do
266266

267267
# Test prof provides factories from code
268268
# and other niceties
269-
gem "test-prof", "~> 1.5.0"
269+
gem "test-prof", "~> 1.6.0"
270270
gem "turbo_tests", github: "opf/turbo_tests", ref: "with-patches"
271271

272272
gem "rack_session_access"
@@ -334,9 +334,6 @@ group :development do
334334
gem "spring-commands-rubocop"
335335

336336
gem "colored2"
337-
338-
# git hooks manager
339-
gem "lefthook", require: false
340337
end
341338

342339
group :development, :test do
@@ -356,6 +353,9 @@ group :development, :test do
356353
# https://github.com/puma/puma/issues/2835#issuecomment-2302133927
357354
gem "byebug"
358355

356+
# Unreleased fix of readline dependency of pry: https://github.com/pry/pry/pull/2366
357+
# Once this gets released, the specific dev dependency on pry can be removed
358+
gem "pry", github: "pry/pry", ref: "135640262879544c6bfecbf3e78511289bfe956c"
359359
gem "pry-byebug", "~> 3.12.0", platforms: [:mri]
360360
gem "pry-rails", "~> 0.3.6"
361361
gem "pry-rescue", "~> 1.6.0"
@@ -387,7 +387,7 @@ end
387387
gem "bootsnap", "~> 1.23.0", require: false
388388

389389
# API gems
390-
gem "grape", "~> 3.1.1"
390+
gem "grape", "~> 3.2.0"
391391
gem "grape_logging", "~> 3.0.0"
392392
gem "roar", "~> 1.2.0"
393393

0 commit comments

Comments
 (0)