summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKatarzyna Kobierska <kkobierska@gmail.com>2016-09-02 15:45:03 +0200
committerKatarzyna Kobierska <kkobierska@gmail.com>2016-09-13 09:05:07 +0200
commitb1016a355eded528c9f9ecb15861d084a6673823 (patch)
tree3ffcf0cd615d34afd1e4d8f0e28a8bb12a15e340
parent9e9829d76b2fa8143f45fc53fde766139c738150 (diff)
downloadgitlab-ce-b1016a355eded528c9f9ecb15861d084a6673823.tar.gz
Improve table code and add CHANGELOG
-rw-r--r--CHANGELOG1
-rw-r--r--app/views/projects/builds/_table.html.haml6
2 files changed, 3 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG
index d69168985cd..273c29ca6d7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -124,6 +124,7 @@ v 8.12.0 (unreleased)
- API for Ci Lint !5953 (Katarzyna Kobierska Urszula Budziszewska)
- Allow bulk update merge requests from merge requests index page
- Add notification_settings API calls !5632 (mahcsig)
+ - Remove duplication between project builds and admin builds view !5680 (Katarzyna Kobierska Ula Budziszewska)
v 8.11.6 (unreleased)
diff --git a/app/views/projects/builds/_table.html.haml b/app/views/projects/builds/_table.html.haml
index b6602f8b083..9e4fd9b767b 100644
--- a/app/views/projects/builds/_table.html.haml
+++ b/app/views/projects/builds/_table.html.haml
@@ -15,12 +15,10 @@
%th Name
%th
%th
- - unless admin
- - if project.build_coverage_enabled?
- Coverage
+ - if !admin && project.build_coverage_enabled?
+ Coverage
%th
-
- if admin
- builds.each do |build|
= render "admin/builds/build", build: build