diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-12-07 23:58:05 -0800 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-12-12 15:07:24 -0800 |
| commit | 0ea70802e19cbe11c6af0f6750200bb137225940 (patch) | |
| tree | 24bb68bb5726f3b896fae93b4155ce7e61c1910c | |
| parent | ad3732955389024b8a209455f9a889d5ebf411b9 (diff) | |
| download | gitlab-ce-0ea70802e19cbe11c6af0f6750200bb137225940.tar.gz | |
Fix Sidekiq worker and make flash message return a link to the pipelines page
| -rw-r--r-- | app/controllers/projects/pipeline_schedules_controller.rb | 2 | ||||
| -rw-r--r-- | app/workers/run_pipeline_schedule_worker.rb | 2 | ||||
| -rw-r--r-- | spec/controllers/projects/pipeline_schedules_controller_spec.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/projects/pipeline_schedules_controller.rb b/app/controllers/projects/pipeline_schedules_controller.rb index a4e865cb9da..fe77d8eabeb 100644 --- a/app/controllers/projects/pipeline_schedules_controller.rb +++ b/app/controllers/projects/pipeline_schedules_controller.rb @@ -46,7 +46,7 @@ class Projects::PipelineSchedulesController < Projects::ApplicationController flash[:notice] = if job_id - 'Successfully scheduled pipeline to run immediately' + "Successfully scheduled a pipeline to run. Go to the <a href=\"#{project_pipelines_path(@project)}\">Pipelines page</a> for details".html_safe else 'Unable to schedule a pipeline to run immediately' end diff --git a/app/workers/run_pipeline_schedule_worker.rb b/app/workers/run_pipeline_schedule_worker.rb index 3e0d3fed20a..7725ad319a3 100644 --- a/app/workers/run_pipeline_schedule_worker.rb +++ b/app/workers/run_pipeline_schedule_worker.rb @@ -1,5 +1,5 @@ class RunPipelineScheduleWorker - include Sidekiq::Worker + include ApplicationWorker include PipelineQueue enqueue_in group: :creation diff --git a/spec/controllers/projects/pipeline_schedules_controller_spec.rb b/spec/controllers/projects/pipeline_schedules_controller_spec.rb index 3878b0a5e4f..debc20ee467 100644 --- a/spec/controllers/projects/pipeline_schedules_controller_spec.rb +++ b/spec/controllers/projects/pipeline_schedules_controller_spec.rb @@ -380,7 +380,7 @@ describe Projects::PipelineSchedulesController do post :play, namespace_id: project.namespace.to_param, project_id: project, id: pipeline_schedule.id - expect(flash[:notice]).to eq 'Successfully scheduled pipeline to run immediately' + expect(flash[:notice]).to start_with 'Successfully scheduled a pipeline to run' expect(response).to have_gitlab_http_status(302) end end |