diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-02-03 16:11:03 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-02-03 16:11:03 +0000 |
| commit | 374387b5b4fbb8b8c1aa0bbc7d307390bbd3ecf7 (patch) | |
| tree | c927a4ee7cf4de67d1e9175b609e22f213ea8eff /app/views/projects/commit | |
| parent | 2159694e5024a129ef77f7b81af4fadcde84334a (diff) | |
| parent | 98e6e3062d4a69b4ed22dcffbb869b26d28fd573 (diff) | |
| download | gitlab-ce-374387b5b4fbb8b8c1aa0bbc7d307390bbd3ecf7.tar.gz | |
Resolve conflict after merge
Diffstat (limited to 'app/views/projects/commit')
| -rw-r--r-- | app/views/projects/commit/_pipeline.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/commit/_pipeline.html.haml b/app/views/projects/commit/_pipeline.html.haml index 08d3443b3d0..6abff6aaf95 100644 --- a/app/views/projects/commit/_pipeline.html.haml +++ b/app/views/projects/commit/_pipeline.html.haml @@ -13,7 +13,7 @@ Pipeline = link_to "##{pipeline.id}", namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id), class: "monospace" with - = pluralize pipeline.statuses.count(:id), "build" + = pluralize pipeline.statuses.count(:id), "job" - if pipeline.ref for = link_to pipeline.ref, namespace_project_commits_path(pipeline.project.namespace, pipeline.project, pipeline.ref), class: "monospace" @@ -44,7 +44,7 @@ %thead %tr %th Status - %th Build ID + %th Job ID %th Name %th - if pipeline.project.build_coverage_enabled? |