Update integration to 2.3.7-12-8863130

hitobito · Nov 26, 2024 · 17567da · 17567da
1 parent 8863130
commit 17567da
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/hitobito b/hitobito
diff --git a/hitobito_pbs b/hitobito_pbs
+15 −33		app/controllers/concerns/sortable.rb
+2 −12		app/controllers/custom_contents_controller.rb
+1 −4		app/controllers/event/kind_categories_controller.rb
+4 −13		app/controllers/event/kinds_controller.rb
+0 −5		app/controllers/help_texts_controller.rb
+0 −1		app/controllers/invoices_controller.rb
+7 −7		app/controllers/label_formats_controller.rb
+1 −1		app/controllers/list_controller.rb
+2 −8		app/controllers/qualification_kinds_controller.rb
+16 −21		app/helpers/navigation_helper.rb
+10 −0		app/helpers/sheet/json_api/documentation.rb
+16 −5		app/models/concerns/globalized.rb
+5 −4		app/models/concerns/paranoia/globalized.rb
+1 −7		app/models/event/kind.rb
+1 −1		app/models/event/participatable.rb
+1 −0		app/models/label_format.rb
+1 −0		app/models/qualification_kind.rb
+4 −2		app/views/custom_contents/_list.html.haml
+2 −2		app/views/help_texts/_list.html.haml
+1 −1		app/views/invoices/_nav_left.html.haml
+1 −4		app/views/people_filters/_qualification.html.haml
+6 −2		app/views/shared/_admin_left_nav.html.haml
+29 −6		config/brakeman.ignore
+5 −4		doc/developer/common/api/json_api.md
+2 −2		spec/controllers/concerns/sortable_spec.rb
+1 −1		spec/models/custom_content_spec.rb
+18 −1		spec/regressions/custom_contents_controller_spec.rb
+17 −0		spec/regressions/event/kinds_controller_spec.rb
+25 −3		spec/regressions/label_formats_controller_spec.rb
+2 −2		spec/support/crud_controller_examples.rb