diff options
| author | John Jarvis <jarv@gitlab.com> | 2019-04-02 10:12:32 +0200 |
|---|---|---|
| committer | John Jarvis <jarv@gitlab.com> | 2019-04-02 10:12:32 +0200 |
| commit | 69b65a6b745e74bba290787420a0017395fd7c25 (patch) | |
| tree | c328963cbe5b340c58c88230d21f338c77462ebd /spec/lib/gitlab/ci/trace/stream_spec.rb | |
| parent | 1b6fe3ae226e4c6f481c90c886e242fcd96ab11b (diff) | |
| parent | 3e81a5baf25d6ecd9ad807a2b8f4238dcc598d5e (diff) | |
| download | gitlab-ce-69b65a6b745e74bba290787420a0017395fd7c25.tar.gz | |
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into jarv/dev-to-gitlab-2019-04-02jarv/dev-to-gitlab-2019-04-02
Diffstat (limited to 'spec/lib/gitlab/ci/trace/stream_spec.rb')
| -rw-r--r-- | spec/lib/gitlab/ci/trace/stream_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/ci/trace/stream_spec.rb b/spec/lib/gitlab/ci/trace/stream_spec.rb index 38626f728d7..e45ea1c2528 100644 --- a/spec/lib/gitlab/ci/trace/stream_spec.rb +++ b/spec/lib/gitlab/ci/trace/stream_spec.rb @@ -414,7 +414,7 @@ describe Gitlab::Ci::Trace::Stream, :clean_gitlab_redis_cache do context 'malicious regexp' do let(:data) { malicious_text } - let(:regex) { malicious_regexp } + let(:regex) { malicious_regexp_re2 } include_examples 'malicious regexp' end |