diff options
| author | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-06-12 08:08:31 +0200 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2017-06-13 06:23:16 +0000 |
| commit | 34655464133921e4dcfed429566271da7f05046b (patch) | |
| tree | e4dde36aac21ecd2ad7fa723e617123e450d372a | |
| parent | 16977ad3f37250dfb26a835e391688123966ec3b (diff) | |
| download | gitlab-ce-fix-9-2-stable-conflicts-for-mr-11706.tar.gz | |
Fix merge conflicts on pipeline schedulesfix-9-2-stable-conflicts-for-mr-11706
| -rw-r--r-- | app/models/ci/pipeline_schedule.rb | 5 | ||||
| -rw-r--r-- | app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml | 7 |
2 files changed, 2 insertions, 10 deletions
diff --git a/app/models/ci/pipeline_schedule.rb b/app/models/ci/pipeline_schedule.rb index ac159074c07..07213ca608a 100644 --- a/app/models/ci/pipeline_schedule.rb +++ b/app/models/ci/pipeline_schedule.rb @@ -28,17 +28,12 @@ module Ci !active? end -<<<<<<< HEAD - def importing_or_inactive? - importing? || inactive? -======= def deactivate! update_attribute(:active, false) end def runnable_by_owner? Ability.allowed?(owner, :create_pipeline, project) ->>>>>>> 9dfecec... Merge branch '32790-pipeline_schedules-pages-throwing-error-500' into 'master' end def set_next_run_at diff --git a/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml b/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml index c4ceba34941..9e4f96839f4 100644 --- a/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml +++ b/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml @@ -4,12 +4,9 @@ = 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' + = link_to pipeline_schedule.ref, namespace_project_commits_path(@project.namespace, @project, pipeline_schedule.ref), class: "branch-name" + %td - if pipeline_schedule.last_pipeline .status-icon-container{ class: "ci-status-icon-#{pipeline_schedule.last_pipeline.status}" } |