summaryrefslogtreecommitdiff
path: root/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-05-25 20:50:26 +0000
committerDouwe Maan <douwe@gitlab.com>2016-05-25 20:50:26 +0000
commitc1167be283e4471e11b32ebf75bc50b416e82423 (patch)
treef54e2446833bf55aa2b3277d39eebf99a12a0d2d /app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
parentfb11004d5e3641b69bda1acba8d6e9f7857f7540 (diff)
parent65925e699839e1f2e01c6c5f7a355d9fae0337d9 (diff)
downloadgitlab-ce-c1167be283e4471e11b32ebf75bc50b416e82423.tar.gz
Merge branch 'improve-pipeline-design' into 'master'
Improve design of Pipeline view ## What does this MR do? Improves current design of Pipelines view when there is multiple stages. This makes the statuses clickable and makes the view more compact. ## Screenshots (if relevant) ![Screen_Shot_2016-05-21_at_01.20.40](/uploads/dd031b7af7005c7a61f3165fefa8b7c9/Screen_Shot_2016-05-21_at_01.20.40.png) cc @DouweM @markpundsack @rspeicher @marin See merge request !4230
Diffstat (limited to 'app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml')
-rw-r--r--app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml4
1 files changed, 0 insertions, 4 deletions
diff --git a/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml b/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
index 5041f0f5c03..5bc5c71283e 100644
--- a/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
+++ b/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
@@ -50,14 +50,10 @@
%td.duration
- if generic_commit_status.duration
- = icon("clock-o")
- &nbsp;
#{duration_in_words(generic_commit_status.finished_at, generic_commit_status.started_at)}
%td.timestamp
- if generic_commit_status.finished_at
- = icon("calendar")
- &nbsp;
%span #{time_ago_with_tooltip(generic_commit_status.finished_at)}
- if defined?(coverage) && coverage