diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-01-04 13:01:36 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-01-04 13:01:36 +0100 |
| commit | 63ec4d484f7f1a208159a9ac42f6c264323f7897 (patch) | |
| tree | 14141f7b7fc0cbe5fa13f02fc9de013690b8c2c6 | |
| parent | 1994c0323af72ff9b3667f5d9f45a99ae09986d4 (diff) | |
| download | gitlab-ce-63ec4d484f7f1a208159a9ac42f6c264323f7897.tar.gz | |
Show yaml error badge in pipelines page if present
| -rw-r--r-- | app/assets/javascripts/vue_pipelines_index/pipeline_url.js.es6 | 6 | ||||
| -rw-r--r-- | spec/features/projects/pipelines/pipelines_spec.rb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/vue_pipelines_index/pipeline_url.js.es6 b/app/assets/javascripts/vue_pipelines_index/pipeline_url.js.es6 index 92c343e33da..ae5649f0519 100644 --- a/app/assets/javascripts/vue_pipelines_index/pipeline_url.js.es6 +++ b/app/assets/javascripts/vue_pipelines_index/pipeline_url.js.es6 @@ -38,7 +38,7 @@ <span v-if='pipeline.flags.latest' class="label label-success has-tooltip" - title="" + title="Latest pipeline for this branch" data-original-title="Latest pipeline for this branch" > latest @@ -46,8 +46,8 @@ <span v-if='pipeline.flags.yaml_errors' class="label label-danger has-tooltip" - title="" - data-original-title="Undefined yaml error" + :title='pipeline.yaml_errors' + :data-original-title='pipeline.yaml_errors' > yaml invalid </span> diff --git a/spec/features/projects/pipelines/pipelines_spec.rb b/spec/features/projects/pipelines/pipelines_spec.rb index cfc74c140dd..91f75bae805 100644 --- a/spec/features/projects/pipelines/pipelines_spec.rb +++ b/spec/features/projects/pipelines/pipelines_spec.rb @@ -93,7 +93,7 @@ describe 'Pipelines', :feature, :js do before { visit_project_pipelines } - it 'contains badge that indicate errors' do + it 'contains badge that indicates errors' do expect(page).to have_content 'yaml invalid' end |