diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-05-23 20:34:42 +0000 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2017-06-08 10:25:37 +0000 |
| commit | 516fd01fd75ff45ea1f191eff007687db3ecf0b7 (patch) | |
| tree | 86541eeba59ecedf0bfb3ff3e4f707fe972719b5 /app | |
| parent | d9b4e4c8651367d13700eadeb5cedd6dd36db9f5 (diff) | |
| download | gitlab-ce-516fd01fd75ff45ea1f191eff007687db3ecf0b7.tar.gz | |
Merge branch '32509-next-run-in-pipeline-schedules-shows-past-time' into 'master'
Use #real_next_run in pipelines table
Closes #32509
See merge request !11660
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml b/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml index 075ecee4343..2f686988cb5 100644 --- a/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml +++ b/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml @@ -15,7 +15,7 @@ None %td.next-run-cell - if pipeline_schedule.active? - = time_ago_with_tooltip(pipeline_schedule.next_run_at) + = time_ago_with_tooltip(pipeline_schedule.real_next_run) - else Inactive %td |