-
- Downloads
Merge branch 'sf/feature/GL421959-saml-auth-flow-for-mr-approval' into 'master'
Add optional SAML Auth requirement for MR approval See merge request !130204 Merged-by:Drew Blessing <drew@gitlab.com> Approved-by:
Illya Klymov <xanf@xanf.me> Approved-by:
Drew Blessing <drew@gitlab.com> Reviewed-by:
Drew Blessing <drew@gitlab.com> Reviewed-by:
Jessie Young <jessieyoung@gitlab.com> Co-authored-by:
Sam Figueroa <sfigueroa@gitlab.com>
No related branches found
No related tags found
Pipeline #1069618481 passed
Stage: sync
Stage: preflight
Stage: prepare
Stage: build-images
Stage: fixtures
Stage: lint
Stage: test
Stage: post-test
Stage: review
Stage: qa
Stage: benchmark
Pipeline: E2E Omnibus GitLab EE
Pipeline: GitLab
Pipeline: E2E GDK
Showing
- app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals.vue 19 additions, 1 deletion...e_merge_request_widget/components/approvals/approvals.vue
- ee/app/assets/javascripts/approvals/constants.js 3 additions, 1 deletionee/app/assets/javascripts/approvals/constants.js
- ee/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js 2 additions, 0 deletions...cripts/vue_merge_request_widget/stores/mr_widget_store.js
- ee/app/controllers/projects/merge_requests/saml_approvals_controller.rb 54 additions, 0 deletions...lers/projects/merge_requests/saml_approvals_controller.rb
- ee/app/helpers/ee/projects_helper.rb 8 additions, 0 deletionsee/app/helpers/ee/projects_helper.rb
- ee/app/helpers/groups/sso_helper.rb 6 additions, 0 deletionsee/app/helpers/groups/sso_helper.rb
- ee/app/models/group_merge_request_approval_setting.rb 9 additions, 6 deletionsee/app/models/group_merge_request_approval_setting.rb
- ee/app/presenters/ee/merge_request_presenter.rb 39 additions, 0 deletionsee/app/presenters/ee/merge_request_presenter.rb
- ee/app/serializers/ee/merge_request_widget_entity.rb 6 additions, 4 deletionsee/app/serializers/ee/merge_request_widget_entity.rb
- ee/app/services/ee/merge_requests/approval_service.rb 31 additions, 3 deletionsee/app/services/ee/merge_requests/approval_service.rb
- ee/app/views/groups/settings/merge_requests/_merge_request_approval_settings.html.haml 1 addition, 1 deletion...merge_requests/_merge_request_approval_settings.html.haml
- ee/config/routes/merge_requests.rb 3 additions, 0 deletionsee/config/routes/merge_requests.rb
- 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 4 additions, 1 deletionee/lib/api/merge_request_approval_settings.rb
- ee/lib/compliance_management/merge_request_approval_settings/resolver.rb 15 additions, 1 deletion...ce_management/merge_request_approval_settings/resolver.rb
- ee/lib/gitlab/auth/group_saml/sso_enforcer.rb 6 additions, 5 deletionsee/lib/gitlab/auth/group_saml/sso_enforcer.rb
- ee/spec/features/merge_request/user_approves_with_saml_auth_spec.rb 91 additions, 0 deletions...atures/merge_request/user_approves_with_saml_auth_spec.rb
- ee/spec/fixtures/api/schemas/public_api/v4/group_merge_request_approval_settings.json 65 additions, 18 deletions.../public_api/v4/group_merge_request_approval_settings.json
- ee/spec/fixtures/api/schemas/public_api/v4/project_approvers.json 37 additions, 9 deletions...fixtures/api/schemas/public_api/v4/project_approvers.json
- ee/spec/frontend/approvals/components/approval_settings_spec.js 1 addition, 0 deletions...c/frontend/approvals/components/approval_settings_spec.js
Loading
-
mentioned in commit 1831ab35
-
mentioned in merge request !136854 (closed)
-
mentioned in commit 7aefb4c1
-
mentioned in commit eba533fe
-
mentioned in merge request !136989 (closed)
Please register or sign in to comment