diff options
author | Kamil TrzciĆski <ayufan@ayufan.eu> | 2017-05-29 23:46:56 +0300 |
---|---|---|
committer | Timothy Andrew <mail@timothyandrew.net> | 2017-06-13 09:23:16 +0300 |
commit | 16977ad3f37250dfb26a835e391688123966ec3b (patch) | |
tree | adc567ab48a34f5a81df4003fbda9e8ba0087f06 /changelogs | |
parent | cd40278beeec41f900f53d1c2df6be944b018647 (diff) |
Merge branch '32790-pipeline_schedules-pages-throwing-error-500' into 'master'
Resolve "pipeline_schedules pages throwing error 500"
Closes #32790
See merge request !11706
Conflicts:
app/models/ci/pipeline_schedule.rb
app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml
Diffstat (limited to 'changelogs')
-rw-r--r-- | changelogs/unreleased/32790-pipeline_schedules-pages-throwing-error-500.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/changelogs/unreleased/32790-pipeline_schedules-pages-throwing-error-500.yml b/changelogs/unreleased/32790-pipeline_schedules-pages-throwing-error-500.yml new file mode 100644 index 00000000000..a58f3a7429e --- /dev/null +++ b/changelogs/unreleased/32790-pipeline_schedules-pages-throwing-error-500.yml @@ -0,0 +1,4 @@ +--- +title: Fix pipeline_schedules pages throwing error 500 +merge_request: 11706 +author: dosuken123 |