WIP: Preparing 9.4.1-ee release
Main release issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/35435
Summary
This MR prepares 9-4-stable-ee
for %9.4 (9.4.1
) by merging 9-4-stable-ee-patch-1
into 9-4-stable-ee
Pick into Stable MRs
MR Filter forSteps
- Ensure all the MRs in above list are picked into
9-4-stable-ee-patch-1
branch. - Note the following in each picked MR:
Picked into https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2507, will merge into `9-4-stable-ee` ready for `9.4.1-ee`
/unlabel ~"Pick into Stable"
- If there are any conflicts while picking MRs, attempt to resolve, otherwise create new MR against
9-4-stable-ee-patch-1
branch and assign it to author of conflicting files. - Consider merging CE-to-EE stable MR into this as well for new workflow
- Once this MR is green merge it.
Merge request reports
Activity
mentioned in merge request !2460 (merged)
mentioned in merge request !2445 (merged)
added 1 commit
- 8f413c37 - Merge branch 'fix-find-each-unscoping-in-mirror-scheduler' into 'master'
added 1 commit
- 2f5bfe3f - Merge branch 'mirror-cleanup-in-project-destroy-service' into 'master'
mentioned in merge request !2439 (merged)
mentioned in merge request !2491 (merged)
mentioned in merge request !2487 (merged)
added 1 commit
- 3d31872f - Merge branch 'docs-trello-power-up-ee' into 'master'
mentioned in merge request !2499 (merged)
mentioned in merge request !2509 (merged)
build failure in
rspec-pg 17 20
💥 https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/24137366retrying...
Failures: 1) Merge Requests > User uses quick actions merge-request-only commands /target_branch command in merge request does not change target branch when merge request is edited Failure/Error: link_to(simple_sanitize(owner.name), user_path(owner)) ActionView::Template::Error: undefined method `name' for nil:NilClass # ./app/helpers/projects_helper.rb:58:in `project_title' # ./app/views/layouts/project.html.haml:3:in `_app_views_layouts_project_html_haml__989230104386323200_55117780' # ./lib/gitlab/i18n.rb:45:in `with_locale' # ... # ------------------ # --- Caused by: --- # NoMethodError: # undefined method `name' for nil:NilClass # ./app/helpers/projects_helper.rb:58:in `project_title' Finished in 43 minutes 41 seconds (files took 47.71 seconds to load) 1603 examples, 1 failure Failed examples: rspec ./spec/features/merge_requests/user_uses_slash_commands_spec.rb:145 # Merge Requests > User uses quick actions merge-request-only commands /target_branch command in merge request does not change target branch when merge request is edited
added 1 commit
- 5a117fbb - Merge branch 'state-counter-cache-stable' into '9-4-stable-ee'
mentioned in merge request !2474 (merged)
added 32 commits
-
5a117fbb...e54716b6 - 32 commits from branch
9-4-stable-ee
-
5a117fbb...e54716b6 - 32 commits from branch