Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
0ea70802
Commit
0ea70802
authored
Dec 07, 2017
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Sidekiq worker and make flash message return a link to the pipelines page
parent
ad373295
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/controllers/projects/pipeline_schedules_controller.rb
app/controllers/projects/pipeline_schedules_controller.rb
+1
-1
app/workers/run_pipeline_schedule_worker.rb
app/workers/run_pipeline_schedule_worker.rb
+1
-1
spec/controllers/projects/pipeline_schedules_controller_spec.rb
...ontrollers/projects/pipeline_schedules_controller_spec.rb
+1
-1
No files found.
app/controllers/projects/pipeline_schedules_controller.rb
View file @
0ea70802
...
@@ -46,7 +46,7 @@ class Projects::PipelineSchedulesController < Projects::ApplicationController
...
@@ -46,7 +46,7 @@ class Projects::PipelineSchedulesController < Projects::ApplicationController
flash
[
:notice
]
=
flash
[
:notice
]
=
if
job_id
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
else
'Unable to schedule a pipeline to run immediately'
'Unable to schedule a pipeline to run immediately'
end
end
...
...
app/workers/run_pipeline_schedule_worker.rb
View file @
0ea70802
class
RunPipelineScheduleWorker
class
RunPipelineScheduleWorker
include
Sidekiq
::
Worker
include
Application
Worker
include
PipelineQueue
include
PipelineQueue
enqueue_in
group: :creation
enqueue_in
group: :creation
...
...
spec/controllers/projects/pipeline_schedules_controller_spec.rb
View file @
0ea70802
...
@@ -380,7 +380,7 @@ describe Projects::PipelineSchedulesController do
...
@@ -380,7 +380,7 @@ describe Projects::PipelineSchedulesController do
post
:play
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
,
id:
pipeline_schedule
.
id
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
)
expect
(
response
).
to
have_gitlab_http_status
(
302
)
end
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment