diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-08-31 15:30:48 +0200 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-08-31 15:30:48 +0200 |
| commit | dc4d938676414579ad8cfca9689439668c90b411 (patch) | |
| tree | 87ed9e977855068f438bd722d1843244002d3a1a | |
| parent | ef030709ebffdecdce67f2693d8c54669edfb7a7 (diff) | |
| download | gitlab-ce-dc4d938676414579ad8cfca9689439668c90b411.tar.gz | |
Fix only/except policy CI/CD linter
| -rw-r--r-- | app/views/ci/lints/_create.html.haml | 4 | ||||
| -rw-r--r-- | spec/views/ci/lints/show.html.haml_spec.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/ci/lints/_create.html.haml b/app/views/ci/lints/_create.html.haml index c91602fcff7..30bf1384b22 100644 --- a/app/views/ci/lints/_create.html.haml +++ b/app/views/ci/lints/_create.html.haml @@ -22,10 +22,10 @@ %b Tag list: = build[:tag_list].to_a.join(", ") %br - %b Refs only: + %b Only policy: = @jobs[build[:name].to_sym][:only].to_a.join(", ") %br - %b Refs except: + %b Except policy: = @jobs[build[:name].to_sym][:except].to_a.join(", ") %br %b Environment: diff --git a/spec/views/ci/lints/show.html.haml_spec.rb b/spec/views/ci/lints/show.html.haml_spec.rb index 3390ae247ff..f2c19c7642a 100644 --- a/spec/views/ci/lints/show.html.haml_spec.rb +++ b/spec/views/ci/lints/show.html.haml_spec.rb @@ -73,8 +73,8 @@ describe 'ci/lints/show' do render expect(rendered).to have_content('Tag list: dotnet') - expect(rendered).to have_content('Refs only: test@dude/repo') - expect(rendered).to have_content('Refs except: deploy') + expect(rendered).to have_content('Only policy: refs, test@dude/repo') + expect(rendered).to have_content('Except policy: refs, deploy') expect(rendered).to have_content('Environment: testing') expect(rendered).to have_content('When: on_success') end |