diff options
author | Rémy Coutable <remy@rymai.me> | 2017-05-22 13:45:10 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-05-22 13:45:10 +0000 |
commit | a5a5f5fe27b494e72db9c4130a9869309f0d5ecf (patch) | |
tree | 586986ffe71db4edbf656a308b9d9b9885eb5d8f | |
parent | 7f31768a7f1d311d7c8cedce045f5d918370b8c9 (diff) | |
parent | 2b0dd7183a51dc91f722e216b6fe4ca6e427a1b9 (diff) | |
download | gitlab-ce-a5a5f5fe27b494e72db9c4130a9869309f0d5ecf.tar.gz |
Merge branch 'change_pipelines_schedules_help_page_path' into 'master'
Change pipelines schedules help page path
See merge request !11592
-rw-r--r-- | app/views/projects/pipeline_schedules/index.html.haml | 4 | ||||
-rw-r--r-- | spec/features/projects/pipeline_schedules_spec.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/pipeline_schedules/index.html.haml b/app/views/projects/pipeline_schedules/index.html.haml index 25c52175e3d..6751efaaf2f 100644 --- a/app/views/projects/pipeline_schedules/index.html.haml +++ b/app/views/projects/pipeline_schedules/index.html.haml @@ -7,14 +7,14 @@ = render "projects/pipelines/head" %div{ class: container_class } - #pipeline-schedules-callout{ data: { docs_url: help_page_path('ci/pipeline_schedules') } } + #pipeline-schedules-callout{ data: { docs_url: help_page_path('user/project/pipelines/schedules') } } .top-area - 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 = link_to new_namespace_project_pipeline_schedule_path(@project.namespace, @project), class: 'btn btn-create' do - %span New Schedule + %span New schedule - if @schedules.present? %ul.content-list diff --git a/spec/features/projects/pipeline_schedules_spec.rb b/spec/features/projects/pipeline_schedules_spec.rb index 03a30bfb996..1211b17b3d8 100644 --- a/spec/features/projects/pipeline_schedules_spec.rb +++ b/spec/features/projects/pipeline_schedules_spec.rb @@ -38,7 +38,7 @@ feature 'Pipeline Schedules', :feature do end it 'creates a new scheduled pipeline' do - click_link 'New Schedule' + click_link 'New schedule' expect(page).to have_content('Schedule a new pipeline') end |