diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-11-21 18:16:42 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-11-21 18:16:42 +0000 |
| commit | 603a6abe5a5145f8bb010334c6a82103f40054ec (patch) | |
| tree | e7a5aa1e82b1f548e30331149a932b956b987b5e /spec/javascripts | |
| parent | 5ca9300be463c2213b9e01fca64c82d21a7f28ea (diff) | |
| parent | 89846cac6498c7c0f36f3b8e59d9d481471960e4 (diff) | |
| download | gitlab-ce-603a6abe5a5145f8bb010334c6a82103f40054ec.tar.gz | |
Merge branch 'fix-xss-vulnerability' into 'master'
Remove v-html
## What does this MR do?
Uses string interpolation instead of `v-html` to prevent xss attacks.
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
See merge request !7616
Diffstat (limited to 'spec/javascripts')
| -rw-r--r-- | spec/javascripts/environments/environment_item_spec.js.es6 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/javascripts/environments/environment_item_spec.js.es6 b/spec/javascripts/environments/environment_item_spec.js.es6 index 54c93367b17..3c15e3b7719 100644 --- a/spec/javascripts/environments/environment_item_spec.js.es6 +++ b/spec/javascripts/environments/environment_item_spec.js.es6 @@ -135,7 +135,7 @@ describe('Environment item', () => { }); it('should render environment name', () => { - expect(component.$el.querySelector('.environment-name').textContent).toEqual(environment.name); + expect(component.$el.querySelector('.environment-name').textContent).toContain(environment.name); }); describe('With deployment', () => { |
