Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
commit 4d60a2c Merge: 7051ade 6e08e10 Author: Philip Guyton <[email protected]> Date: Wed Jul 12 13:06:48 2023 +0100 Merge pull request rockstor#2617 from phillxnet/2615_Bump_versions_to_a_4.6.1_base_(Stable)_-_master_branch Bump versions to a 4.6.1 base (Stable) - master branch rockstor#2615 commit 6e08e10 Author: Philip Guyton <[email protected]> Date: Wed Jul 12 13:04:14 2023 +0100 Bump versions to a 4.6.1 base (Stable) - master branch rockstor#2615 pyproject.toml build.sh commit 7051ade Merge: 9fdeff3 e3648a8 Author: Philip Guyton <[email protected]> Date: Tue Jul 11 17:18:10 2023 +0100 Merge pull request rockstor#2614 from phillxnet/2613_Cherry-pick_-_Update_unit_tests_re_recent_SSL_Cert_update_changes Update unit tests re recent SSL Cert update changes rockstor#2613 commit e3648a8 Author: Philip Guyton <[email protected]> Date: Tue Jul 11 16:45:55 2023 +0100 Update unit tests re recent SSL Cert update changes rockstor#2611 Move test mocking from superctl to systemctl accordingly. Includes - Commented instructions on running these tests. commit 9fdeff3 Merge: c11c912 6284eb7 Author: Philip Guyton <[email protected]> Date: Mon Jul 10 15:34:26 2023 +0100 Merge pull request rockstor#2605 from phillxnet/2566_SSL_Certificate_update_doesn't_restart_nginx SSL Certificate update doesn't reload nginx rockstor#2566 commit 6284eb7 Author: Philip Guyton <[email protected]> Date: Mon Jul 10 15:17:34 2023 +0100 SSL Certificate update doesn't reload nginx rockstor#2566 Use systemctl wrapper to reload nginx post SSL cert reconfig. From Rockstor v4.5.4-0 onwards nginx is no longer managed by supervisord. # Includes - Nginx reload not restart to avoid Web-UI service interruption and enable confirmation dialog display. commit c11c912 Merge: 65df1a6 ae3f342 Author: Philip Guyton <[email protected]> Date: Sun Jul 9 18:28:36 2023 +0100 Merge pull request rockstor#2601 from phillxnet/#2599_Revise_Stable_Updates_activation_instructions_re_legacy_shop_removal Revise Stable Updates activation re legacy shop removal rockstor#2599 commit ae3f342 Author: Philip Guyton <[email protected]> Date: Sun Jul 9 18:08:49 2023 +0100 Revise Stable Updates activation instructions re legacy shop removal rockstor#2599 Modify our "Activate Stable updates" dialog instructions in accordance with our removal of the now legacy/redundant shop that has now been replaced by Appman's initial integration with our newly established Open Collective. commit 65df1a6 Merge: 1d4b9d5 b496902 Author: Philip Guyton <[email protected]> Date: Sun Jul 9 17:46:04 2023 +0100 Merge pull request rockstor#2597 from FroggyFlox/2596_Release_process_changes_in_accompanying_repositories Add GitHub Action to trigger post-release updates across repositories rockstor#2596 commit b496902 Author: FroggyFlox <[email protected]> Date: Mon Jul 3 11:24:18 2023 -0400 Add GitHub Action to trigger post-release updates across repositories After each release, we are currently manually performing the required changes and udpates across our repositories. This commit adds a GitHub Action workflow to trigger these changes automatically. commit 1d4b9d5 Merge: 0249f52 46f8cb4 Author: Philip Guyton <[email protected]> Date: Tue May 30 17:05:42 2023 +0100 Merge pull request rockstor#2563 from phillxnet/master Merge testing branch into master rockstor#2529 commit 0249f52 Merge: 81a0d5f 15ae137 Author: Philip Guyton <[email protected]> Date: Wed Nov 2 17:18:34 2022 +0000 Merge pull request rockstor#2413 from rockstor/2412_configure_Dependabot_against_testing_branch configure Dependabot against testing branch rockstor#2412 commit 15ae137 Author: Philip Guyton <[email protected]> Date: Mon Oct 31 15:12:36 2022 +0000 configure Dependabot against testing branch rockstor#2412 Begin explicit configuration of GitHub Dependabot, adding a target-branch directive of "testing".
- Loading branch information