diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-04 21:22:41 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-04 21:22:41 +0000 |
| commit | 848097b57bcde309b2e40fbae74d642d87af9718 (patch) | |
| tree | e9116bb6c2553f97b2f1f8bbde6101024387e5b4 /app | |
| parent | cad767260dff3fac366a63400b60cd4211b05b85 (diff) | |
| parent | 73146801e6b350c731a26dcfa68d79268fa314d4 (diff) | |
| download | gitlab-ce-848097b57bcde309b2e40fbae74d642d87af9718.tar.gz | |
Merge branch 'fix/sm/35931-active-ci-pipelineschedule-have-nullified-next_run_at' into 'master'
Fix "pipeline_schedules pages throwing error 500" when "Active Ci::PipelineSchedule have a nullified `next_run_at`"
Closes #32790
See merge request !13286
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 7343d6e039c..bd8c38292d6 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 @@ - else = s_("PipelineSchedules|None") %td.next-run-cell - - if pipeline_schedule.active? + - if pipeline_schedule.active? && pipeline_schedule.next_run_at = time_ago_with_tooltip(pipeline_schedule.real_next_run) - else = s_("PipelineSchedules|Inactive") |