diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-11-04 22:37:44 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-11-04 22:37:44 +0800 |
| commit | fb9a0e5277f9825d7faf991c0600a7247b268fe8 (patch) | |
| tree | 35000cd71ebf5de840c2c931d2f1c7a9b7357dad /app/views/projects/ci/pipelines/_pipeline.html.haml | |
| parent | ce1dc4c25d3464b7a9a1b21d93157c9fed98f705 (diff) | |
| parent | 5368b9f249485e254a90fe7daa551d61412bee26 (diff) | |
| download | gitlab-ce-fb9a0e5277f9825d7faf991c0600a7247b268fe8.tar.gz | |
Merge remote-tracking branch 'upstream/master' into show-status-from-branch
* upstream/master: (35 commits)
Only skip group when it's actually a group in the "Share with group" select
Fix: Todos Filter Shows All Users
Fix: Guest sees some repository details and gets 404
Move shared params to a helper
GrapeDSL for project hooks
Update commits.scss
updated styling commit SHA on branches page + added to changelog
change build list height to show 6,5 builds + improve padding of list, with first/last child selectors
Ignore builds directory from eslint
Add changelog entry
Document multiple repository storage paths
Allow multiple repository storage shards to be enabled, and automatically round-robin between them
Cleaned up global namespace JS
Add tip for using Chrome to run and debug teaspoon tests.
Add CHANGELOG entry file
Add jquery.timeago.js to application.js
Update match-regex to fix filename convention
Move jquery.timeago to vendor directory
Change a bunch of doc links to either relative or https://docs.gitlab.com.
Show log corresponding to env in admin/logs
...
Diffstat (limited to 'app/views/projects/ci/pipelines/_pipeline.html.haml')
| -rw-r--r-- | app/views/projects/ci/pipelines/_pipeline.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/ci/pipelines/_pipeline.html.haml b/app/views/projects/ci/pipelines/_pipeline.html.haml index 840f468dc05..1f748d73d06 100644 --- a/app/views/projects/ci/pipelines/_pipeline.html.haml +++ b/app/views/projects/ci/pipelines/_pipeline.html.haml @@ -41,7 +41,7 @@ - else Cant find HEAD commit for this branch - - stages_status = pipeline.statuses.relevant.latest.stages_status + - stages_status = pipeline.statuses.latest.stages_status %td.stage-cell - stages.each do |stage| - status = stages_status[stage] |