Skip to content

Commit e7c8d7a

Browse files
authored
Merge branch 'dev' into merge-release/17.7-20260807041945
2 parents 88c0ce0 + e637506 commit e7c8d7a

2,514 files changed

Lines changed: 69186 additions & 15934 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.
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# frozen_string_literal: true
2+
3+
#-- copyright
4+
# OpenProject is an open source project management software.
5+
# Copyright (C) the OpenProject GmbH
6+
#
7+
# This program is free software; you can redistribute it and/or
8+
# modify it under the terms of the GNU General Public License version 3.
9+
#
10+
# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
11+
# Copyright (C) 2006-2013 Jean-Philippe Lang
12+
# Copyright (C) 2010-2013 the ChiliProject Team
13+
#
14+
# This program is free software; you can redistribute it and/or
15+
# modify it under the terms of the GNU General Public License
16+
# as published by the Free Software Foundation; either version 2
17+
# of the License, or (at your option) any later version.
18+
#
19+
# This program is distributed in the hope that it will be useful,
20+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
21+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22+
# GNU General Public License for more details.
23+
#
24+
# You should have received a copy of the GNU General Public License
25+
# along with this program; if not, write to the Free Software
26+
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
27+
#
28+
# See COPYRIGHT and LICENSE files for more details.
29+
#++
30+
31+
OP_PRIMER_REGEX = %r{app/components/op_primer/}
32+
33+
def modified_op_primer_files
34+
(git.modified_files + git.added_files).grep(OP_PRIMER_REGEX)
35+
end
36+
37+
changed_files = modified_op_primer_files
38+
39+
if changed_files.any?
40+
message_lines = [
41+
"@opf/dream-team Files in `app/components/op_primer` were modified:",
42+
""
43+
]
44+
45+
changed_files.each do |file|
46+
message_lines << "- #{file}"
47+
end
48+
49+
message_lines << <<~EOS
50+
51+
Please review these changes to ensure they align with the design system guidelines.
52+
EOS
53+
54+
warn message_lines.join("\n")
55+
end

.github/workflows/brakeman-scan-core.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ on:
66
- dev
77
- release/*
88
paths:
9-
- '**.rb'
9+
- "**.rb"
1010
schedule:
11-
- cron: '10 6 * * 1'
11+
- cron: "10 6 * * 1"
1212

1313
permissions:
1414
contents: read
1515

1616
jobs:
1717
brakeman-scan:
1818
permissions:
19-
contents: read # for actions/checkout to fetch code
20-
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
19+
contents: read # for actions/checkout to fetch code
20+
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
2121
if: github.repository == 'opf/openproject'
2222
name: Brakeman Scan
2323
runs-on: ubuntu-latest
@@ -30,7 +30,7 @@ jobs:
3030
persist-credentials: false
3131

3232
- name: Setup Ruby
33-
uses: ruby/setup-ruby@12fd324f1d0b43274fdc8130f6980590a667c455 # v1
33+
uses: ruby/setup-ruby@003a5c4d8d6321bd302e38f6f0ec593f77f06600 # v1
3434

3535
- name: Setup Brakeman
3636
run: |

.github/workflows/cla.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ jobs:
7878
openprojectci,
7979
psatyal,
8080
samachon,
81+
schm,
8182
shiroginne,
8283
toy,
8384
tiroessler,
@@ -91,7 +92,8 @@ jobs:
9192
fereshtehnm,
9293
thykel,
9394
j-racsko,
94-
FeliciaMundhenke2904
95+
FeliciaMundhenke2904,
96+
tinexw
9597
# the followings are the optional inputs - If the optional inputs are not given, then default values will be taken
9698
remote-organization-name: opf
9799
remote-repository-name: legal

.github/workflows/crowdin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
with:
4747
ref: ${{ matrix.branch }}
4848
fetch-depth: 1
49-
- uses: ruby/setup-ruby@12fd324f1d0b43274fdc8130f6980590a667c455 # v1
49+
- uses: ruby/setup-ruby@003a5c4d8d6321bd302e38f6f0ec593f77f06600 # v1
5050
with:
5151
bundler-cache: true
5252
- name: "Set crowdin branch name"

.github/workflows/danger.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ on:
44
pull_request:
55
types: [opened, reopened, synchronize]
66
paths-ignore:
7-
- 'docs/**'
8-
- 'help/**'
9-
- 'packaging/**'
10-
- '.pkgr.yml'
7+
- "docs/**"
8+
- "help/**"
9+
- "packaging/**"
10+
- ".pkgr.yml"
1111

1212
jobs:
1313
danger:
@@ -22,7 +22,7 @@ jobs:
2222
with:
2323
fetch-depth: 0
2424
persist-credentials: false
25-
- uses: ruby/setup-ruby@12fd324f1d0b43274fdc8130f6980590a667c455 # v1
25+
- uses: ruby/setup-ruby@003a5c4d8d6321bd302e38f6f0ec593f77f06600 # v1
2626
with:
2727
ruby-version: .ruby-version
2828
bundler-cache: true

.github/workflows/docs.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ on:
66
- dev
77
- release/*
88
paths:
9-
- 'docs/**'
10-
- 'config/static_links.yml'
9+
- "docs/**"
10+
- "config/static_links.yml"
1111

1212
permissions:
1313
contents: read
@@ -20,7 +20,7 @@ jobs:
2020
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
2121
with:
2222
persist-credentials: false
23-
- uses: ruby/setup-ruby@12fd324f1d0b43274fdc8130f6980590a667c455 # v1
23+
- uses: ruby/setup-ruby@003a5c4d8d6321bd302e38f6f0ec593f77f06600 # v1
2424
with:
2525
bundler-cache: true
2626
- run: bundle exec ./script/docs/check_links
@@ -39,7 +39,7 @@ jobs:
3939
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
4040
with:
4141
persist-credentials: false
42-
- uses: ruby/setup-ruby@12fd324f1d0b43274fdc8130f6980590a667c455 # v1
42+
- uses: ruby/setup-ruby@003a5c4d8d6321bd302e38f6f0ec593f77f06600 # v1
4343
with:
4444
bundler-cache: true
4545
- run: script/docs/check_readme_yaml_header_syntax

.github/workflows/erb-lint-core.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name: ERB lint
33
on:
44
pull_request:
55
paths:
6-
- '**/*.erb'
7-
- '.erb_lint.yml'
8-
- '.erb_linters/**'
6+
- "**/*.erb"
7+
- ".erb_lint.yml"
8+
- ".erb_linters/**"
99

1010
jobs:
1111
erb-lint:
@@ -20,7 +20,7 @@ jobs:
2020
with:
2121
persist-credentials: false
2222
- name: Set up Ruby
23-
uses: ruby/setup-ruby@12fd324f1d0b43274fdc8130f6980590a667c455 # v1
23+
uses: ruby/setup-ruby@003a5c4d8d6321bd302e38f6f0ec593f77f06600 # v1
2424
with:
2525
bundler-cache: true
2626
- name: Run ERB lint

.github/workflows/i18n-tasks.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ on:
66
- dev
77
- release/*
88
paths-ignore:
9-
- 'docs/**'
10-
- 'help/**'
9+
- "docs/**"
10+
- "help/**"
1111
pull_request:
1212
types: [opened, reopened, synchronize]
1313
paths-ignore:
14-
- 'docs/**'
15-
- 'help/**'
16-
- 'packaging/**'
17-
- '.pkgr.yml'
14+
- "docs/**"
15+
- "help/**"
16+
- "packaging/**"
17+
- ".pkgr.yml"
1818

1919
permissions:
2020
contents: read
@@ -33,7 +33,7 @@ jobs:
3333
persist-credentials: false
3434

3535
- name: Setup Ruby
36-
uses: ruby/setup-ruby@12fd324f1d0b43274fdc8130f6980590a667c455 # v1
36+
uses: ruby/setup-ruby@003a5c4d8d6321bd302e38f6f0ec593f77f06600 # v1
3737

3838
- name: Setup i18n-tasks
3939
run: |

.github/workflows/openapi.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ on:
66
- dev
77
- release/*
88
paths:
9-
- 'docs/api/apiv3/**'
9+
- "docs/api/apiv3/**"
1010
pull_request:
1111
types: [opened, reopened, synchronize]
1212
paths:
13-
- 'docs/api/apiv3/**'
13+
- "docs/api/apiv3/**"
1414

1515
jobs:
1616
api-spec:
@@ -20,14 +20,14 @@ jobs:
2020
permissions:
2121
contents: read
2222
steps:
23-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
24-
with:
25-
persist-credentials: false
26-
- uses: ruby/setup-ruby@12fd324f1d0b43274fdc8130f6980590a667c455 # v1
27-
with:
28-
bundler-cache: false
29-
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
30-
with:
31-
node-version: '24.18.0'
32-
package-manager-cache: false
33-
- run: ./script/api/validate_spec
23+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
24+
with:
25+
persist-credentials: false
26+
- uses: ruby/setup-ruby@003a5c4d8d6321bd302e38f6f0ec593f77f06600 # v1
27+
with:
28+
bundler-cache: false
29+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
30+
with:
31+
node-version: "24.18.0"
32+
package-manager-cache: false
33+
- run: ./script/api/validate_spec

.github/workflows/rubocop-core.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: RuboCop
33
on:
44
pull_request:
55
paths-ignore:
6-
- 'docs/**'
6+
- "docs/**"
77

88
jobs:
99
rubocop:
@@ -18,7 +18,7 @@ jobs:
1818
with:
1919
persist-credentials: false
2020
- name: Set up Ruby
21-
uses: ruby/setup-ruby@12fd324f1d0b43274fdc8130f6980590a667c455 # v1
21+
uses: ruby/setup-ruby@003a5c4d8d6321bd302e38f6f0ec593f77f06600 # v1
2222
- name: Run RuboCop
2323
uses: reviewdog/action-rubocop@b6d5e953a5fc0bf3ab65254e77730ea2174d6d6d # v2
2424
with:

0 commit comments

Comments
 (0)