diff options
author | Regis <boudinot.regis@yahoo.com> | 2016-12-23 16:34:56 -0700 |
---|---|---|
committer | Regis <boudinot.regis@yahoo.com> | 2016-12-23 16:34:56 -0700 |
commit | 71d731a21b96cdd9d1881a8e03961f7008cb8d64 (patch) | |
tree | f31b57dde85b65345733b4bcd3915bab37236e47 /app/views/projects/pipelines | |
parent | 115536fbfa9904cef459bb735d29f20756887ebe (diff) | |
parent | 21fb690c216f9e40be07229726e106d7016e13fc (diff) | |
download | gitlab-ce-71d731a21b96cdd9d1881a8e03961f7008cb8d64.tar.gz |
merge master and fix application.rb conflict
Diffstat (limited to 'app/views/projects/pipelines')
-rw-r--r-- | app/views/projects/pipelines/_stage.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/pipelines/_stage.html.haml b/app/views/projects/pipelines/_stage.html.haml index 20456e792e7..cf1b366bf2c 100644 --- a/app/views/projects/pipelines/_stage.html.haml +++ b/app/views/projects/pipelines/_stage.html.haml @@ -1,4 +1,4 @@ %ul - - @stage.statuses.each do |status| + - @stage.statuses.latest.each do |status| %li.dropdown-build = render 'ci/status/graph_badge', subject: status |