diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-08-15 18:45:45 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-08-15 18:45:45 +0800 |
| commit | b5d1e6341b67206de8b90ef693723434368363cf (patch) | |
| tree | b04bf8a5d0d387de4b7f8d239f9c1aa521640cd9 /app/views/projects/ci | |
| parent | 21fdc1edaecf228c1fdc540375bbdad0fd69164a (diff) | |
| parent | a391652fe60930e2139ecfacb175da6aa0f3b1e9 (diff) | |
| download | gitlab-ce-b5d1e6341b67206de8b90ef693723434368363cf.tar.gz | |
Merge branch 'pipeline-hooks-without-slack' into wall-clock-time-for-showing-pipeline
* pipeline-hooks-without-slack: (156 commits)
Fix test failures
Make pipeline to be in created state for hooks tests
Make `execute_methods` public
Added specs for started_at and finished_at
Use explicit events to transition between states
Fix tests. We cannot reload unless it's already saved:
Have trait all_events_enabled so that's easier to reuse, feedback:
Simplify the name for data builder, feedback:
Prefer extend self over module_function, feedback:
Make it more grammatically correct, feedback:
if -> when; when -> `when`; %w() -> %w[]; and fix some typos:
Prefer described_class, feedback:
Make the comment more clear, feedback:
Update CHANGELOG
render only commit title
Fix test failures, that did occur because of missing previously used `reload_status!` call
Use state machine for pipeline event processing
Upgrade Rails to 4.2.7.1 for security fixes.
Update gitlab-shell to v3.3.3
Verify the pipeline status after executing events on builds
...
Diffstat (limited to 'app/views/projects/ci')
| -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 c2fecbf9d4c..f415a5e9c0e 100644 --- a/app/views/projects/ci/pipelines/_pipeline.html.haml +++ b/app/views/projects/ci/pipelines/_pipeline.html.haml @@ -33,7 +33,7 @@ Cant find HEAD commit for this branch - - stages_status = pipeline.statuses.latest.stages_status + - stages_status = pipeline.statuses.relevant.latest.stages_status - stages.each do |stage| %td.stage-cell - status = stages_status[stage] |