-
- Downloads
Rename for reauthentication vs just password
- In an effor to rename require_password_to_approve to reflect that it can reference either SAML or password authentication we are adding this merge request approval setting field as its replacement. The require_password_to_approve field will be deprecated with API V5. - The MergeRequestApprovalSettings API Grape module needs to mirror the params for the deprecated and the new version until the removal is done. This is to ensure either setting can be used in the API. If both are provided we default to using the new version (require_reauthentication_value) - Refs: #431346 !150710 (comment 1912459777) !150710 (comment 1912459768) !150710 (comment 1912459750) !150710 (comment 1912459735) !150710 (comment 1912459720) Changelog: changed EE: true
Showing
- app/validators/json_schemas/scan_result_policy_project_approval_settings.json 3 additions, 0 deletions...schemas/scan_result_policy_project_approval_settings.json
- doc/api/merge_request_approvals.md 13 additions, 4 deletionsdoc/api/merge_request_approvals.md
- doc/user/compliance/audit_event_types.md 1 addition, 0 deletionsdoc/user/compliance/audit_event_types.md
- ee/app/models/ee/project.rb 24 additions, 0 deletionsee/app/models/ee/project.rb
- ee/app/models/group_merge_request_approval_setting.rb 18 additions, 2 deletionsee/app/models/group_merge_request_approval_setting.rb
- ee/app/services/merge_request_approval_settings/update_service.rb 22 additions, 17 deletions...ervices/merge_request_approval_settings/update_service.rb
- ee/config/audit_events/types/require_reauthentication_to_approve_updated.yml 10 additions, 0 deletions...nts/types/require_reauthentication_to_approve_updated.yml
- ee/lib/api/entities/merge_request_approval_setting.rb 1 addition, 0 deletionsee/lib/api/entities/merge_request_approval_setting.rb
- ee/lib/api/merge_request_approval_settings.rb 36 additions, 5 deletionsee/lib/api/merge_request_approval_settings.rb
- ee/lib/audit/group_merge_request_approval_setting_changes_auditor.rb 2 additions, 2 deletions...t/group_merge_request_approval_setting_changes_auditor.rb
- ee/lib/audit/project_setting_changes_auditor.rb 7 additions, 0 deletionsee/lib/audit/project_setting_changes_auditor.rb
- ee/lib/compliance_management/merge_request_approval_settings/resolver.rb 14 additions, 1 deletion...ce_management/merge_request_approval_settings/resolver.rb
- ee/lib/ee/api/entities/approval_settings.rb 3 additions, 0 deletionsee/lib/ee/api/entities/approval_settings.rb
- ee/spec/fixtures/api/schemas/public_api/v4/group_merge_request_approval_settings.json 11 additions, 0 deletions.../public_api/v4/group_merge_request_approval_settings.json
- ee/spec/lib/api/entities/merge_request_approval_setting_spec.rb 2 additions, 1 deletion...c/lib/api/entities/merge_request_approval_setting_spec.rb
- ee/spec/lib/audit/group_merge_request_approval_setting_changes_auditor_spec.rb 27 additions, 14 deletions...up_merge_request_approval_setting_changes_auditor_spec.rb
- ee/spec/lib/compliance_management/merge_request_approval_settings/resolver_spec.rb 37 additions, 0 deletions...nagement/merge_request_approval_settings/resolver_spec.rb
- ee/spec/models/ee/project_spec.rb 78 additions, 0 deletionsee/spec/models/ee/project_spec.rb
- ee/spec/models/group_merge_request_approval_setting_spec.rb 46 additions, 2 deletionsee/spec/models/group_merge_request_approval_setting_spec.rb
- ee/spec/requests/api/merge_request_approval_settings_spec.rb 35 additions, 2 deletionsee/spec/requests/api/merge_request_approval_settings_spec.rb
Please register or sign in to comment