diff options
author | Phil Hughes <me@iamphill.com> | 2017-07-12 08:47:20 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-07-12 08:47:20 +0100 |
commit | ab6c89356a4b24591d182942ddc7567cf80017fe (patch) | |
tree | 5f8f3a0d09c40f09794c261ba526839f90f7971f /app/views/projects/pipeline_schedules | |
parent | 8e9ae78007010afb967cdf01f29568744d4c8c7a (diff) | |
parent | 2b827d05786a2175281b8f3319570a839b66a627 (diff) | |
download | gitlab-ce-ab6c89356a4b24591d182942ddc7567cf80017fe.tar.gz |
Merge branch 'master' into new-nav-fix-contextual-breadcrumbs
Diffstat (limited to 'app/views/projects/pipeline_schedules')
-rw-r--r-- | app/views/projects/pipeline_schedules/index.html.haml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/views/projects/pipeline_schedules/index.html.haml b/app/views/projects/pipeline_schedules/index.html.haml index 652d52d6814..89042ef4a03 100644 --- a/app/views/projects/pipeline_schedules/index.html.haml +++ b/app/views/projects/pipeline_schedules/index.html.haml @@ -7,7 +7,7 @@ - @no_container = true - page_title _("Pipeline Schedules") -- if show_new_nav? +- if show_new_nav? && can?(current_user, :create_pipeline_schedule, @project) - content_for :breadcrumbs_extra do = link_to _('New schedule'), new_namespace_project_pipeline_schedule_path(@project.namespace, @project), class: 'btn btn-create' @@ -21,9 +21,10 @@ - schedule_path_proc = ->(scope) { pipeline_schedules_path(@project, scope: scope) } = render "tabs", schedule_path_proc: schedule_path_proc, all_schedules: @all_schedules, scope: @scope - .nav-controls{ class: ("visible-xs" if show_new_nav?) } - = link_to new_project_pipeline_schedule_path(@project), class: 'btn btn-create' do - %span= _('New schedule') + - if can?(current_user, :create_pipeline_schedule, @project) + .nav-controls{ class: ("visible-xs" if show_new_nav?) } + = link_to new_project_pipeline_schedule_path(@project), class: 'btn btn-create' do + %span= _('New schedule') - if @schedules.present? %ul.content-list |