Skip to content

Commit 4e5f609

Browse files
Release OpenProject 14.1.0
2 parents 462d76a + 4c1ff89 commit 4e5f609

File tree

1,814 files changed

+42501
-26829
lines changed

Some content is hidden

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

1,814 files changed

+42501
-26829
lines changed

.github/workflows/create-merge-release-into-dev-pr.yml

+14-6
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
steps:
1717
- id: find_latest_release
1818
env:
19-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
19+
GITHUB_TOKEN: ${{ secrets.OPENPROJECT_CI_GH_TOKEN }}
2020
GITHUB_REPOSITORY: ${{ github.repository }}
2121
run: |
2222
BRANCH=$(curl -H "Authorization: token $GITHUB_TOKEN" \
@@ -79,11 +79,19 @@ jobs:
7979
echo "Successfully merged $RELEASE_BRANCH into $BASE_BRANCH and pushed"
8080
else
8181
# Close all previous PRs with label
82-
for pr_number in $(gh pr list --label create-merge-release-into-dev-pr --json number --jq='.[].number'); do
83-
gh pr close "$pr_number"
82+
pr_numbers=$(gh pr list --label create-merge-release-into-dev-pr --json number --jq='.[].number')
83+
for pr_number in $pr_numbers; do
84+
gh pr close "$pr_number" --delete-branch
8485
done
8586
86-
TEMP_BRANCH="$RELEASE_BRANCH-$(date "+%Y%m%d%H%M%S")"
87+
pr_body=$(
88+
echo 'Created by GitHub action'
89+
for pr_number in $pr_numbers; do
90+
echo "Replaces #$pr_number"
91+
done
92+
)
93+
94+
TEMP_BRANCH="merge-$RELEASE_BRANCH-$(date "+%Y%m%d%H%M%S")"
8795
8896
git branch "$TEMP_BRANCH" "$RELEASE_BRANCH"
8997
@@ -93,10 +101,10 @@ jobs:
93101
--base "$BASE_BRANCH" \
94102
--head "$TEMP_BRANCH" \
95103
--title "Merge $RELEASE_BRANCH into $BASE_BRANCH" \
96-
--body 'Created by GitHub action' \
104+
--body "$pr_body" \
97105
--label create-merge-release-into-dev-pr
98106
echo "Created a PR to merge $RELEASE_BRANCH ($TEMP_BRANCH) into $BASE_BRANCH"
99107
fi
100108
fi
101109
env:
102-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
110+
GITHUB_TOKEN: ${{ secrets.OPENPROJECT_CI_GH_TOKEN }}

.github/workflows/danger.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- uses: actions/checkout@v4
1818
- uses: ruby/setup-ruby@v1
1919
with:
20-
ruby-version: '3.2.3'
20+
ruby-version: '3.3.1'
2121
- uses: MeilCli/danger-action@v5
2222
with:
2323
danger_file: 'Dangerfile'

.github/workflows/test-core.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ jobs:
4444
uses: runs-on/cache@v4
4545
with:
4646
path: cache/bundle
47-
key: gem-${{ hashFiles('Gemfile.lock') }}
47+
key: gem-${{ hashFiles('.ruby-version') }}-${{ hashFiles('Gemfile.lock') }}
4848
restore-keys: |
49-
gem-
49+
gem-${{ hashFiles('.ruby-version') }}-
5050
- name: Cache NPM
5151
uses: runs-on/cache@v4
5252
with:

.rubocop.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
require:
22
- rubocop-rails
33
- rubocop-rspec
4+
- rubocop-rspec_rails
45
- ./lib_static/rubocop/cop/open_project/add_preview_for_view_component.rb
56
- ./lib_static/rubocop/cop/open_project/no_do_end_block_with_rspec_capybara_matcher_in_expect.rb
67
- ./lib_static/rubocop/cop/open_project/use_service_result_factory_methods.rb
@@ -21,7 +22,7 @@ inherit_mode:
2122
- Exclude
2223

2324
AllCops:
24-
TargetRubyVersion: 3.2
25+
TargetRubyVersion: 3.3
2526
# Enable any new cops in new versions by default
2627
NewCops: enable
2728
Exclude:

.ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.2.3
1+
3.3.1

Gemfile

+11-8
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ gem "doorkeeper", "~> 5.6.6"
5050
# Maintain our own omniauth due to relative URL root issues
5151
# see upstream PR: https://github.com/omniauth/omniauth/pull/903
5252
gem "omniauth", git: "https://github.com/opf/omniauth", ref: "fe862f986b2e846e291784d2caa3d90a658c67f0"
53-
gem "request_store", "~> 1.6.0"
53+
gem "request_store", "~> 1.7.0"
5454

5555
gem "warden", "~> 1.2"
5656
gem "warden-basic_auth", "~> 0.2.1"
@@ -115,6 +115,8 @@ gem "ruby-duration", "~> 3.2.0"
115115
# released.
116116
gem "mail", "= 2.8.1"
117117

118+
gem "csv", "~> 3.3"
119+
118120
# provide compatible filesystem information for available storage
119121
gem "sys-filesystem", "~> 1.4.0", require: false
120122

@@ -138,7 +140,7 @@ gem "rack-attack", "~> 6.7.0"
138140
gem "secure_headers", "~> 6.5.0"
139141

140142
# Browser detection for incompatibility checks
141-
gem "browser", "~> 5.3.0"
143+
gem "browser", "~> 6.0.0"
142144

143145
# Providing health checks
144146
gem "okcomputer", "~> 1.18.1"
@@ -157,10 +159,11 @@ gem "airbrake", "~> 13.0.0", require: false
157159

158160
gem "md_to_pdf", git: "https://github.com/opf/md-to-pdf", ref: "8f14736a88ad0064d2a97be108fe7061ffbcee91"
159161
gem "prawn", "~> 2.4"
162+
gem "ttfunk", "~> 1.7.0" # remove after https://github.com/prawnpdf/prawn/issues/1346 resolved.
160163
# prawn implicitly depends on matrix gem no longer in ruby core with 3.1
161164
gem "matrix", "~> 0.4.2"
162165

163-
gem "meta-tags", "~> 2.20.0"
166+
gem "meta-tags", "~> 2.21.0"
164167

165168
gem "paper_trail", "~> 15.1.0"
166169

@@ -170,7 +173,7 @@ group :production do
170173
# we use dalli as standard memcache client
171174
# requires memcached 1.4+
172175
gem "dalli", "~> 3.2.0"
173-
gem "redis", "~> 5.1.0"
176+
gem "redis", "~> 5.2.0"
174177
end
175178

176179
gem "i18n-js", "~> 4.2.3"
@@ -185,7 +188,7 @@ gem "rack-timeout", "~> 0.6.3", require: "rack/timeout/base"
185188

186189
gem "nokogiri", "~> 1.16.0"
187190

188-
gem "carrierwave", "~> 1.3.1"
191+
gem "carrierwave", "~> 1.3.4"
189192
gem "carrierwave_direct", "~> 2.1.0"
190193
gem "fog-aws"
191194

@@ -214,7 +217,7 @@ gem "appsignal", "~> 3.0", require: false
214217

215218
gem "view_component"
216219
# Lookbook
217-
gem "lookbook", "~> 2.2.1"
220+
gem "lookbook", "~> 2.3.0"
218221

219222
# Require factory_bot for usage with openproject plugins testing
220223
gem "factory_bot", "~> 6.4.0", require: false
@@ -264,7 +267,7 @@ group :test do
264267
gem "capybara-screenshot", "~> 1.0.17"
265268
gem "cuprite", "~> 0.15.0"
266269
gem "selenium-devtools"
267-
gem "selenium-webdriver", "~> 4.18.0"
270+
gem "selenium-webdriver", "~> 4.20"
268271

269272
gem "fuubar", "~> 2.5.0"
270273
gem "timecop", "~> 0.9.0"
@@ -383,4 +386,4 @@ end
383386

384387
gem "openproject-octicons", "~>19.10.0"
385388
gem "openproject-octicons_helper", "~>19.10.0"
386-
gem "openproject-primer_view_components", "~>0.28.1"
389+
gem "openproject-primer_view_components", "~>0.29.1"

0 commit comments

Comments
 (0)