diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-11-01 15:20:54 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-11-01 15:20:54 +0000 |
| commit | 3c99d8308a481b3f6edb002912ffc4d760b7fb64 (patch) | |
| tree | 73555ed44c63103ae57836dd00587e45d084dff2 /spec/lib/gitlab/ci/ansi2html_spec.rb | |
| parent | 0336dc438b6faab575df996364076b57e388cc27 (diff) | |
| parent | d3a407d66fa553f3ff8afd1b9e42f01b9912e14a (diff) | |
| download | gitlab-ce-3c99d8308a481b3f6edb002912ffc4d760b7fb64.tar.gz | |
Merge branch 'master' into 'gl-ui-progress-bar'gl-ui-progress-bar
# Conflicts:
# app/assets/javascripts/commons/gitlab_ui.js
Diffstat (limited to 'spec/lib/gitlab/ci/ansi2html_spec.rb')
| -rw-r--r-- | spec/lib/gitlab/ci/ansi2html_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/ci/ansi2html_spec.rb b/spec/lib/gitlab/ci/ansi2html_spec.rb index 7549e9941b6..5a5c071c639 100644 --- a/spec/lib/gitlab/ci/ansi2html_spec.rb +++ b/spec/lib/gitlab/ci/ansi2html_spec.rb @@ -7,7 +7,7 @@ describe Gitlab::Ci::Ansi2html do expect(convert_html("Hello")).to eq('Hello') end - it "strips non-color-changing controll sequences" do + it "strips non-color-changing control sequences" do expect(convert_html("Hello \e[2Kworld")).to eq('Hello world') end |