Merge branch 'security-xss-feature-flag-audit-log-13-11' into '13-11-stable-ee' (2e4e49ff) · Commits · gitlab-cn / Gitlab · JiHu GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

Gitlab
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

gitlab-cn
Gitlab
Commits
2e4e49ff

Commit 2e4e49ff authored 4 years ago by

GitLab Release Tools Bot

Downloads
- Plain Diff

Merge branch 'security-xss-feature-flag-audit-log-13-11' into '13-11-stable-ee'

Fix XSS on audit log for feature flag actions

See merge request gitlab-org/security/gitlab!1475

parents 437ff343 e0140c81

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

app/models/audit_event.rb 11 additions, 0 deletions

app/models/audit_event.rb
app/services/feature_flags/base_service.rb 3 additions, 3 deletions

app/services/feature_flags/base_service.rb
app/services/feature_flags/create_service.rb 1 addition, 2 deletions

app/services/feature_flags/create_service.rb
app/services/feature_flags/destroy_service.rb 1 addition, 1 deletion

app/services/feature_flags/destroy_service.rb
app/services/feature_flags/update_service.rb 6 additions, 6 deletions

app/services/feature_flags/update_service.rb
ee/app/assets/javascripts/audit_events/components/table_cells/html_table_cell.vue 6 additions, 10 deletions

...s/audit_events/components/table_cells/html_table_cell.vue
ee/spec/frontend/audit_events/components/table_cells/html_table_cell_spec.js 3 additions, 11 deletions

...dit_events/components/table_cells/html_table_cell_spec.js
spec/models/audit_event_spec.rb 9 additions, 3 deletions

spec/models/audit_event_spec.rb
spec/services/feature_flags/create_service_spec.rb 6 additions, 6 deletions

spec/services/feature_flags/create_service_spec.rb
spec/services/feature_flags/destroy_service_spec.rb 1 addition, 1 deletion

spec/services/feature_flags/destroy_service_spec.rb
spec/services/feature_flags/update_service_spec.rb 14 additions, 14 deletions

spec/services/feature_flags/update_service_spec.rb

with 61 additions and 57 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment