diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-01-05 14:10:43 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-01-05 14:10:43 -0600 |
| commit | 10d483eaaaccc336399fa83a0ac5f7ecd9cea352 (patch) | |
| tree | 14d9df1251e0fd0cccccfd20a92f06fabf0a28dd /spec/javascripts/spec_helper.js | |
| parent | 5997a86e680e22454522819e1b959d18cad48d1f (diff) | |
| parent | df5223de61253ba1511ae3ecbb7c447819177ecb (diff) | |
| download | gitlab-ce-10d483eaaaccc336399fa83a0ac5f7ecd9cea352.tar.gz | |
Merge branch 'fix-u2f-fixtures' into 26226-generate-all-haml-fixtures-within-teaspoon-fixtures-task
* fix-u2f-fixtures:
generate u2f frontend fixtures dynamically
force utf-8 encoding for prior to fixture parsing to prevent nokogiri issues
exclude script type=text/template from dom scrubbing
Diffstat (limited to 'spec/javascripts/spec_helper.js')
0 files changed, 0 insertions, 0 deletions