Skip to content

Merge release/17.3 into dev#22684

Merged
EinLama merged 32 commits intodevfrom
merge-release/17.3-20260408042316
Apr 8, 2026
Merged

Merge release/17.3 into dev#22684
EinLama merged 32 commits intodevfrom
merge-release/17.3-20260408042316

Conversation

@openprojectci
Copy link
Copy Markdown
Contributor

Created by GitHub action
Replaces #22681

HDinger and others added 30 commits March 31, 2026 15:29
…r-cannot-save-their-notifications-preferences-if-they-save-the-show-versions-folded-boolean-as-no
…r-cannot-save-their-notifications-preferences-if-they-save-the-show-versions-folded-boolean-as-no
Fixes

rspec ./modules/costs/spec/features/time_entry_dialog_spec.rb:330

The reason it failed is that the id of the searched for work package might also be the id of the project or the status. Using the subject is stable
…in-wp-unit-costs-1

[72685] User can input anything in WP unit costs
…sponsive-on-mobile-after-pir

[70388] Sidebar menu button unresponsive on mobile (after PIR)
…ting-is-unclear

[#73196 & friends] Meeting participants sorting is unclear
…their-notifications-preferences-if-they-save-the-show-versions-folded-boolean-as-no
…otifications-preferences-if-they-save-the-show-versions-folded-boolean-as-no

Bug/73464 user cannot save their notifications preferences if they save the show versions folded boolean as no
# Conflicts:
#	modules/backlogs/app/views/rb_master_backlogs/_backlog_and_sprints_list.html.erb
… does not respect project boundaries

https://community.openproject.org/work_packages/73446

- Remove default order from work_packages association and create order_by_position scope for work packages
- Add sprint planning spec
- Make sure the work packages without a position are placed at the end of the list.
- Add specs for WorkPackage.order_by_position
…-their-story-points-in-sprint-header-does-not-respect-project-boundaries

[#73446] Sum of work packages and their story points in sprint header are incorrect
@openprojectci openprojectci added the create-merge-release-into-dev-pr Mark auto created PRs that will be auto closed too label Apr 8, 2026
# Conflicts:
#	config/locales/crowdin/el.yml
#	modules/backlogs/app/forms/my/backlogs_form.rb
#	modules/backlogs/app/views/shared/_view_my_settings.html.erb
#	modules/backlogs/config/locales/crowdin/ru.yml
#	modules/backlogs/config/locales/crowdin/uk.yml
#	modules/two_factor_authentication/config/locales/crowdin/el.yml
#	modules/wikis/config/locales/crowdin/uk.yml
@@ -39,9 +39,6 @@ uk:
sprint_sharing: "Sprint sharing"
sprint:
duration: "Тривалість спринту"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This goes for a few of these translation files, just taking this one as an example:

The red changes contain the correct keys. Of course we don't have a localized version for these yet, as not only the keys, but also the wording within the values has been changed.

But: since these are all based upon the master en.yml file, we should be able to just ignore these 🤔 They will be overwritten by the next Crowdin import IIRC.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@EinLama the translations were handled automatically using the script in #22249 - the idea of that PR was to reduce churn, but it might just be better to always prefer dev. See comment here. Feedback welcome. / @toy

Copy link
Copy Markdown
Contributor

@EinLama EinLama left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a conflict resolution where parts of #22641 should be preferred. This affects the my-page and user preferences.

Copy link
Copy Markdown
Contributor

@EinLama EinLama left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I resolved the conflicts that bothered me, LGTM now! 👍🏻

@EinLama
Copy link
Copy Markdown
Contributor

EinLama commented Apr 8, 2026

The failing spec is green locally and seems to be flaky

@EinLama EinLama merged commit 9097782 into dev Apr 8, 2026
19 of 21 checks passed
@EinLama EinLama deleted the merge-release/17.3-20260408042316 branch April 8, 2026 18:31
@github-actions github-actions bot locked and limited conversation to collaborators Apr 8, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

create-merge-release-into-dev-pr Mark auto created PRs that will be auto closed too

Development

Successfully merging this pull request may close these issues.

8 participants