Merge branch 'release_23.1' into release_23.2

# Conflicts:
#	lib/galaxy/version.py
#	packages/app/HISTORY.rst
#	packages/app/setup.cfg
#	packages/auth/HISTORY.rst
#	packages/auth/setup.cfg
#	packages/config/HISTORY.rst
#	packages/config/setup.cfg
#	packages/data/HISTORY.rst
#	packages/data/setup.cfg
#	packages/files/HISTORY.rst
#	packages/files/setup.cfg
#	packages/job_execution/HISTORY.rst
#	packages/job_execution/setup.cfg
#	packages/job_metrics/HISTORY.rst
#	packages/job_metrics/setup.cfg
#	packages/navigation/HISTORY.rst
#	packages/navigation/setup.cfg
#	packages/objectstore/HISTORY.rst
#	packages/objectstore/setup.cfg
#	packages/selenium/HISTORY.rst
#	packages/selenium/setup.cfg
#	packages/test_api/HISTORY.rst
#	packages/test_api/setup.cfg
#	packages/test_base/HISTORY.rst
#	packages/test_base/setup.cfg
#	packages/test_driver/HISTORY.rst
#	packages/test_driver/setup.cfg
#	packages/tool_util/HISTORY.rst
#	packages/tool_util/setup.cfg
#	packages/tours/HISTORY.rst
#	packages/tours/setup.cfg
#	packages/util/HISTORY.rst
#	packages/util/setup.cfg
#	packages/web_apps/HISTORY.rst
#	packages/web_apps/setup.cfg
#	packages/web_framework/HISTORY.rst
#	packages/web_framework/setup.cfg
#	packages/web_stack/HISTORY.rst
#	packages/web_stack/setup.cfg

packages/app/HISTORY.rst

@@ -9,6 +9,18 @@ History
 
 
 
+-------------------
+23.1.4 (2024-01-04)
+-------------------
+
+
+=========
+Bug fixes
+=========
+
+* Fix workflow index total matches counting by `@davelopez <https://github.com/davelopez>`_ in `#17176 <https://github.com/galaxyproject/galaxy/pull/17176>`_
+* Fix `url_for` in tool error reports by `@davelopez <https://github.com/davelopez>`_ in `#17210 <https://github.com/galaxyproject/galaxy/pull/17210>`_
+
 -------------------
 23.1.3 (2023-12-01)
 -------------------
@@ -48,6 +60,7 @@ Enhancements
 Bug fixes
 =========
 
+* 
 * 
 * read job_conf directly from `config_dir` instead of computing it again from `config_file` by `@bernt-matthias <https://github.com/bernt-matthias>`_ in `#15596 <https://github.com/galaxyproject/galaxy/pull/15596>`_
 * Fix some drs handling issues by `@nuwang <https://github.com/nuwang>`_ in `#15777 <https://github.com/galaxyproject/galaxy/pull/15777>`_
@@ -104,6 +117,7 @@ Bug fixes
 Enhancements
 ============
 
+* 
 * 
 * Empower Users to Select Storage Destination by `@jmchilton <https://github.com/jmchilton>`_ in `#14073 <https://github.com/galaxyproject/galaxy/pull/14073>`_
 * External Login Flow: Redirect users if account already exists by `@ahmedhamidawan <https://github.com/ahmedhamidawan>`_ in `#15019 <https://github.com/galaxyproject/galaxy/pull/15019>`_
@@ -190,6 +204,7 @@ Other changes
 Bug fixes
 =========
 
+* 
 * 
 * 
 * Fix upload paramfile handling (for real user setups) by `@bernt-matthias <https://github.com/bernt-matthias>`_ in `#16504 <https://github.com/galaxyproject/galaxy/pull/16504>`_
@@ -205,6 +220,7 @@ Bug fixes
 Enhancements
 ============
 
+* 
 * 
 * 
 * Update pulsar client library to 0.15.5 by `@mvdbeek <https://github.com/mvdbeek>`_ in `#16701 <https://github.com/galaxyproject/galaxy/pull/16701>`_
@@ -221,6 +237,7 @@ Bug fixes
 * 
 * 
 * 
+* 
 * Skip installing npm/yarn if available, fix conditional dependency parsing, create virtualenv via conda when conda active by `@bernt-matthias <https://github.com/bernt-matthias>`_ in `#16403 <https://github.com/galaxyproject/galaxy/pull/16403>`_
 * Fix test discovery in vscode by `@mvdbeek <https://github.com/mvdbeek>`_ in `#16413 <https://github.com/galaxyproject/galaxy/pull/16413>`_
 * Fixes for (gitlab) error reporting by `@bernt-matthias <https://github.com/bernt-matthias>`_ in `#16424 <https://github.com/galaxyproject/galaxy/pull/16424>`_
@@ -238,6 +255,7 @@ Bug fixes
 * 
 * 
 * 
+* 
 * Fix default when statement evaluation by `@mvdbeek <https://github.com/mvdbeek>`_ in `#16332 <https://github.com/galaxyproject/galaxy/pull/16332>`_
 * Redact private role name and description when purging user by `@mvdbeek <https://github.com/mvdbeek>`_ in `#16349 <https://github.com/galaxyproject/galaxy/pull/16349>`_
 
@@ -255,6 +273,7 @@ Bug fixes
 * 
 * 
 * 
+* 
 * Bump galaxy-release-util version to 0.1.2 by `@mvdbeek <https://github.com/mvdbeek>`_ in `#16241 <https://github.com/galaxyproject/galaxy/pull/16241>`_
 
 ============
@@ -264,12 +283,14 @@ Enhancements
 * 
 * 
 * 
+* 
 * When importing tool data bundles, use the first loc file for the matching table by `@natefoo <https://github.com/natefoo>`_ in `#16247 <https://github.com/galaxyproject/galaxy/pull/16247>`_
 
 =============
 Other changes
 =============
 
+* 
 * 
 * 
 * Forward port of slugify username received from oidc by `@nuwang <https://github.com/nuwang>`_ in `#16271 <https://github.com/galaxyproject/galaxy/pull/16271>`_
@@ -289,6 +310,7 @@ Bug fixes
 * 
 * 
 * 
+* 
 * Fix ``Text File Busy`` errors at the source by `@mvdbeek <https://github.com/mvdbeek>`_ in `#16212 <https://github.com/galaxyproject/galaxy/pull/16212>`_
 
 ============
@@ -301,6 +323,7 @@ Enhancements
 * 
 * 
 * 
+* 
 * Point release deps fixes and docs by `@mvdbeek <https://github.com/mvdbeek>`_ in `#16214 <https://github.com/galaxyproject/galaxy/pull/16214>`_
 * Use galaxy-release-util to upload python packages by `@mvdbeek <https://github.com/mvdbeek>`_ in `#16240 <https://github.com/galaxyproject/galaxy/pull/16240>`_
 
@@ -320,6 +343,7 @@ Bug fixes
 * 
 * 
 * 
+* 
 * Display DCE in job parameter component, allow rerunning with DCE input by `@mvdbeek <https://github.com/mvdbeek>`_ in `#15744 <https://github.com/galaxyproject/galaxy/pull/15744>`_
 * Fix mixed outputs_to_working_directory pulsar destinations by `@mvdbeek <https://github.com/mvdbeek>`_ in `#15927 <https://github.com/galaxyproject/galaxy/pull/15927>`_
 * Update Gravity to 1.0.3 by `@natefoo <https://github.com/natefoo>`_ in `#15939 <https://github.com/galaxyproject/galaxy/pull/15939>`_
@@ -349,6 +373,7 @@ Other changes
 * 
 * 
 * 
+* 
 * Startup fix when tool removed between reboot by `@mvdbeek <https://github.com/mvdbeek>`_ in `#16175 <https://github.com/galaxyproject/galaxy/pull/16175>`_
 
 -------------------

packages/auth/HISTORY.rst

@@ -9,6 +9,12 @@ History
 
 
 
+-------------------
+23.1.4 (2024-01-04)
+-------------------
+
+No recorded changes since last release
+
 -------------------
 23.1.3 (2023-12-01)
 -------------------

packages/config/HISTORY.rst

@@ -9,6 +9,12 @@ History
 
 
 
+-------------------
+23.1.4 (2024-01-04)
+-------------------
+
+No recorded changes since last release
+
 -------------------
 23.1.3 (2023-12-01)
 -------------------
@@ -42,6 +48,7 @@ Enhancements
 Bug fixes
 =========
 
+* 
 * 
 * Fix some drs handling issues by `@nuwang <https://github.com/nuwang>`_ in `#15777 <https://github.com/galaxyproject/galaxy/pull/15777>`_
 * Improve container resolver documentation by `@mvdbeek <https://github.com/mvdbeek>`_ in `#16280 <https://github.com/galaxyproject/galaxy/pull/16280>`_
@@ -53,6 +60,7 @@ Bug fixes
 Enhancements
 ============
 
+* 
 * 
 * External Login Flow: Redirect users if account already exists by `@ahmedhamidawan <https://github.com/ahmedhamidawan>`_ in `#15019 <https://github.com/galaxyproject/galaxy/pull/15019>`_
 * Add slack error reporting plugin by `@hexylena <https://github.com/hexylena>`_ in `#15025 <https://github.com/galaxyproject/galaxy/pull/15025>`_
@@ -97,6 +105,7 @@ No recorded changes since last release
 Bug fixes
 =========
 
+* 
 * 
 * 
 * Minor bug fix for default mail templates by `@neoformit <https://github.com/neoformit>`_ in `#16362 <https://github.com/galaxyproject/galaxy/pull/16362>`_
@@ -132,12 +141,14 @@ Bug fixes
 * 
 * 
 * 
+* 
 * Change default watchdog inotify_buffer log level to info by `@mvdbeek <https://github.com/mvdbeek>`_ in `#15967 <https://github.com/galaxyproject/galaxy/pull/15967>`_
 
 ============
 Enhancements
 ============
 
+* 
 * 
 * 
 * Add ``ca_certs`` option for sentry client by `@mvdbeek <https://github.com/mvdbeek>`_ in `#15943 <https://github.com/galaxyproject/galaxy/pull/15943>`_

packages/data/HISTORY.rst

@@ -9,6 +9,23 @@ History
 
 
 
+-------------------
+23.1.4 (2024-01-04)
+-------------------
+
+
+=========
+Bug fixes
+=========
+
+* Fix User.current_galaxy_session by `@mvdbeek <https://github.com/mvdbeek>`_ in `#17232 <https://github.com/galaxyproject/galaxy/pull/17232>`_
+
+=============
+Other changes
+=============
+
+* Backport #17188: Fix for converter tests by `@mvdbeek <https://github.com/mvdbeek>`_ in `#17231 <https://github.com/galaxyproject/galaxy/pull/17231>`_
+
 -------------------
 23.1.3 (2023-12-01)
 -------------------
@@ -29,6 +46,7 @@ Bug fixes
 Bug fixes
 =========
 
+* 
 * Skip change_datatype things if we're not actually changing the extension by `@mvdbeek <https://github.com/mvdbeek>`_ in `#16931 <https://github.com/galaxyproject/galaxy/pull/16931>`_
 * Fix copying metadata to copied job outputs by `@mvdbeek <https://github.com/mvdbeek>`_ in `#17007 <https://github.com/galaxyproject/galaxy/pull/17007>`_
 * Update tar_to_directory dependency by `@mvdbeek <https://github.com/mvdbeek>`_ in `#17009 <https://github.com/galaxyproject/galaxy/pull/17009>`_
@@ -52,6 +70,7 @@ Enhancements
 Bug fixes
 =========
 
+* 
 * 
 * Fix bad auto-merge of dev. by `@jmchilton <https://github.com/jmchilton>`_ in `#15386 <https://github.com/galaxyproject/galaxy/pull/15386>`_
 * Merge conflicting db migration branches into one by `@jdavcs <https://github.com/jdavcs>`_ in `#15771 <https://github.com/galaxyproject/galaxy/pull/15771>`_
@@ -83,6 +102,7 @@ Bug fixes
 Enhancements
 ============
 
+* 
 * 
 * Empower Users to Select Storage Destination by `@jmchilton <https://github.com/jmchilton>`_ in `#14073 <https://github.com/galaxyproject/galaxy/pull/14073>`_
 * Add Storage Dashboard visualizations for histories by `@davelopez <https://github.com/davelopez>`_ in `#14820 <https://github.com/galaxyproject/galaxy/pull/14820>`_
@@ -142,6 +162,7 @@ Other changes
 Bug fixes
 =========
 
+* 
 * 
 * 
 * Fix extra files path handling by `@mvdbeek <https://github.com/mvdbeek>`_ in `#16541 <https://github.com/galaxyproject/galaxy/pull/16541>`_
@@ -159,6 +180,7 @@ Bug fixes
 * 
 * 
 * 
+* 
 * Copy when_expression when copying workflow step by `@mvdbeek <https://github.com/mvdbeek>`_ in `#16377 <https://github.com/galaxyproject/galaxy/pull/16377>`_
 
 -------------------
@@ -192,6 +214,7 @@ Bug fixes
 * 
 * 
 * 
+* 
 * Display DCE in job parameter component, allow rerunning with DCE input by `@mvdbeek <https://github.com/mvdbeek>`_ in `#15744 <https://github.com/galaxyproject/galaxy/pull/15744>`_
 * Fix folder listing via file browser by `@mvdbeek <https://github.com/mvdbeek>`_ in `#15950 <https://github.com/galaxyproject/galaxy/pull/15950>`_
 * Fix RO-crate invocation export with complex collections by `@davelopez <https://github.com/davelopez>`_ in `#15971 <https://github.com/galaxyproject/galaxy/pull/15971>`_

packages/files/HISTORY.rst

@@ -9,6 +9,17 @@ History
 
 
 
+-------------------
+23.1.4 (2024-01-04)
+-------------------
+
+
+=========
+Bug fixes
+=========
+
+* Separate collection and non-collection data element by `@mvdbeek <https://github.com/mvdbeek>`_ in `#17236 <https://github.com/galaxyproject/galaxy/pull/17236>`_
+
 -------------------
 23.1.3 (2023-12-01)
 -------------------
@@ -35,6 +46,7 @@ Bug fixes
 Bug fixes
 =========
 
+* 
 * 
 * Fix some drs handling issues by `@nuwang <https://github.com/nuwang>`_ in `#15777 <https://github.com/galaxyproject/galaxy/pull/15777>`_
 * Fix filesource file url support by `@nuwang <https://github.com/nuwang>`_ in `#15794 <https://github.com/galaxyproject/galaxy/pull/15794>`_
@@ -80,6 +92,7 @@ No recorded changes since last release
 Bug fixes
 =========
 
+* 
 * 
 * 
 * Fix dropbox import to support newer versions by `@nuwang <https://github.com/nuwang>`_ in `#16239 <https://github.com/galaxyproject/galaxy/pull/16239>`_

packages/job_execution/HISTORY.rst

@@ -9,6 +9,12 @@ History
 
 
 
+-------------------
+23.1.4 (2024-01-04)
+-------------------
+
+No recorded changes since last release
+
 -------------------
 23.1.3 (2023-12-01)
 -------------------
@@ -37,6 +43,7 @@ Bug fixes
 Bug fixes
 =========
 
+* 
 * 
 * Fix tags ownership by `@davelopez <https://github.com/davelopez>`_ in `#16339 <https://github.com/galaxyproject/galaxy/pull/16339>`_
 * Push to object store even if ``set_meta`` fails by `@mvdbeek <https://github.com/mvdbeek>`_ in `#16667 <https://github.com/galaxyproject/galaxy/pull/16667>`_
@@ -66,6 +73,7 @@ Enhancements
 Bug fixes
 =========
 
+* 
 * 
 * 
 * Fix extra files path handling by `@mvdbeek <https://github.com/mvdbeek>`_ in `#16541 <https://github.com/galaxyproject/galaxy/pull/16541>`_

packages/job_metrics/HISTORY.rst

@@ -9,6 +9,12 @@ History
 
 
 
+-------------------
+23.1.4 (2024-01-04)
+-------------------
+
+No recorded changes since last release
+
 -------------------
 23.1.3 (2023-12-01)
 -------------------

packages/navigation/HISTORY.rst

@@ -9,6 +9,12 @@ History
 
 
 
+-------------------
+23.1.4 (2024-01-04)
+-------------------
+
+No recorded changes since last release
+
 -------------------
 23.1.3 (2023-12-01)
 -------------------

packages/objectstore/HISTORY.rst

@@ -9,6 +9,12 @@ History
 
 
 
+-------------------
+23.1.4 (2024-01-04)
+-------------------
+
+No recorded changes since last release
+
 -------------------
 23.1.3 (2023-12-01)
 -------------------
@@ -61,6 +67,7 @@ Other changes
 Bug fixes
 =========
 
+* 
 * 
 * 
 * Fix extra files path handling by `@mvdbeek <https://github.com/mvdbeek>`_ in `#16541 <https://github.com/galaxyproject/galaxy/pull/16541>`_

packages/selenium/HISTORY.rst

@@ -9,6 +9,12 @@ History
 
 
 
+-------------------
+23.1.4 (2024-01-04)
+-------------------
+
+No recorded changes since last release
+
 -------------------
 23.1.3 (2023-12-01)
 -------------------
@@ -86,6 +92,7 @@ No recorded changes since last release
 Enhancements
 ============
 
+* 
 * 
 * 
 * Port selenium setup to non-deprecated selenium options by `@mvdbeek <https://github.com/mvdbeek>`_ in `#16215 <https://github.com/galaxyproject/galaxy/pull/16215>`_
@@ -106,6 +113,7 @@ Enhancements
 * 
 * 
 * 
+* 
 * Add support for launching workflows via Tutorial Mode by `@hexylena <https://github.com/hexylena>`_ in `#15684 <https://github.com/galaxyproject/galaxy/pull/15684>`_
 
 -------------------