diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-05-29 20:46:56 +0000 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2017-06-13 06:23:16 +0000 |
| commit | 16977ad3f37250dfb26a835e391688123966ec3b (patch) | |
| tree | adc567ab48a34f5a81df4003fbda9e8ba0087f06 /app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml | |
| parent | cd40278beeec41f900f53d1c2df6be944b018647 (diff) | |
| download | gitlab-ce-16977ad3f37250dfb26a835e391688123966ec3b.tar.gz | |
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 'app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml')
| -rw-r--r-- | app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml b/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml index 2f686988cb5..c4ceba34941 100644 --- a/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml +++ b/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml @@ -4,7 +4,12 @@ = pipeline_schedule.description %td.branch-name-cell = icon('code-fork') +<<<<<<< HEAD = link_to pipeline_schedule.ref, namespace_project_commits_path(@project.namespace, @project, pipeline_schedule.ref), class: "branch-name" +======= + - if pipeline_schedule.ref + = link_to pipeline_schedule.ref, project_ref_path(@project, pipeline_schedule.ref), class: "ref-name" +>>>>>>> 9dfecec... Merge branch '32790-pipeline_schedules-pages-throwing-error-500' into 'master' %td - if pipeline_schedule.last_pipeline .status-icon-container{ class: "ci-status-icon-#{pipeline_schedule.last_pipeline.status}" } |