New commits detected on ManageIQ/manageiq/gaprindashvili: https://github.com/ManageIQ/manageiq/commit/b4ecec83c0bde5903261aef088ea594310522308 commit b4ecec83c0bde5903261aef088ea594310522308 Author: Gregg Tanzillo <gtanzill> AuthorDate: Wed Jan 24 09:03:33 2018 -0500 Commit: Gregg Tanzillo <gtanzill> CommitDate: Wed Jan 24 09:03:33 2018 -0500 Merge pull request #16792 from hstastna/Default_Container_Image_Rate_delete_description Add condition to fix deletion of Default Container Image Rate (cherry picked from commit 164cd082924e89a20acd810cdb9b3f383a2f01a9) https://bugzilla.redhat.com/show_bug.cgi?id=1552260 app/models/chargeback_rate.rb | 2 +- spec/models/chargeback_rate_spec.rb | 8 + 2 files changed, 9 insertions(+), 1 deletion(-)
New commit detected on ManageIQ/manageiq-ui-classic/gaprindashvili: https://github.com/ManageIQ/manageiq-ui-classic/commit/67174afb2dd94d7443fff3917681998e056b0f4e commit 67174afb2dd94d7443fff3917681998e056b0f4e Author: Harpreet Kataria <hkataria> AuthorDate: Fri Feb 9 11:17:10 2018 -0500 Commit: Harpreet Kataria <hkataria> CommitDate: Fri Feb 9 11:17:10 2018 -0500 Merge pull request #3215 from hstastna/Default_Container_Image_Rate_delete Fix deletion of Default Container Image Rate (cherry picked from commit 8806d612ebba610d3319575fd42f4866fcb37808) Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1552260 app/controllers/chargeback_controller.rb | 21 +- spec/controllers/chargeback_controller_spec.rb | 53 + 2 files changed, 62 insertions(+), 12 deletions(-)
Tested on 5.9.2.0. The Default Container Image Rate can no longer be deleted, but it can still be edited. To be consistent with the Default Compute and Storage rates, editing should also be disabled.
The core part for fixing the bug: https://github.com/ManageIQ/manageiq/pull/17188
https://github.com/ManageIQ/manageiq-ui-classic/pull/3673
https://github.com/ManageIQ/manageiq/pull/17214
New commit detected on ManageIQ/manageiq/master: https://github.com/ManageIQ/manageiq/commit/f2349afab08e41ecfdd9ccbed01d85c0b073ed88 commit f2349afab08e41ecfdd9ccbed01d85c0b073ed88 Author: Hilda Stastna <hstastna> AuthorDate: Thu Mar 22 12:53:33 2018 -0400 Commit: Hilda Stastna <hstastna> CommitDate: Thu Mar 22 12:53:33 2018 -0400 Refactor ensure_nondefault method for chargeback rate https://bugzilla.redhat.com/show_bug.cgi?id=1552260 Refactor ensure_nondefault method so that a new default? method is created and improved. app/models/chargeback_rate.rb | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-)
New commit detected on ManageIQ/manageiq-ui-classic/master: https://github.com/ManageIQ/manageiq-ui-classic/commit/267a363436550780fc3d592b64c4a0f9e421f7ce commit 267a363436550780fc3d592b64c4a0f9e421f7ce Author: Hilda Stastna <hstastna> AuthorDate: Thu Mar 22 13:08:26 2018 -0400 Commit: Hilda Stastna <hstastna> CommitDate: Thu Mar 22 13:08:26 2018 -0400 Refactor disabled? method for chargeback rate remove button https://bugzilla.redhat.com/show_bug.cgi?id=1552260 Refactor the method according to the changes in core repo. app/helpers/application_helper/button/chargeback_rate_remove.rb | 8 +- 1 file changed, 1 insertion(+), 7 deletions(-)
https://github.com/ManageIQ/manageiq-ui-classic/pull/3741