OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub
Ruby agile-developmentangularbcfboardsbug-trackerganttgantt-chartifcissue-trackerjira-alternativekanbanopenprojectproduct-managementproject-managementproject-planningroadmaprubyscrumtimelineworkflows
Resolve conflicts
Mir Bhatia72ef854c325d
diff --git a/modules/meeting/app/components/meeting_agenda_items/item_component/show_component.html.erb b/modules/meeting/app/components/meeting_agenda_items/item_component/show_component.html.erbindex 7a0f68d0075..fa08a8aa01a 100644--- a/modules/meeting/app/components/meeting_agenda_items/item_component/show_component.html.erb+++ b/modules/meeting/app/components/meeting_agenda_items/item_component/show_component.html.erb@@ -78,21 +78,24 @@with_item_group(menu) doif editable?menu.with_sub_menu_item(label: "Move") do |submenu|- with_item_group(submenu) { move_actions(submenu) } unless first? && last?+ unless first? && last?+ move_actions(submenu)+ end++ submenu.with_divider if move_to_different_section_or_meeting_action_added? && !(first? && last?)- with_item_group(submenu) do- if !in_template? || in_backlog?- if in_backlog?- move_to_current_meeting_action_item(submenu) if !visible_sections?- else- move_to_backlog_action_item(submenu)- end- move_to_section_action_item(submenu) if visible_sections?+ if !in_template? || in_backlog?+ if in_backlog?+ move_to_current_meeting_action_item(submenu)+ else+ move_to_backlog_action_item(submenu)end+ move_to_section_action_item(submenu)end- with_item_group(submenu) do- move_to_next_meeting_action_item(submenu) if move_to_next_meeting_enabled?+ if move_to_next_meeting_enabled?+ submenu.with_divider+ move_to_next_meeting_action_item(submenu)endendend