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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
a1debf5c
Commit
a1debf5c
authored
Apr 10, 2017
by
Filipa Lacerda
Committed by
Grzegorz Bizon
May 05, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Retry and cancel endpoints send 204 json response. Request is made with type json
parent
3a2b60f7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
3 deletions
+19
-3
app/assets/javascripts/pipelines/services/pipelines_service.js
...ssets/javascripts/pipelines/services/pipelines_service.js
+1
-1
app/controllers/projects/pipelines_controller.rb
app/controllers/projects/pipelines_controller.rb
+18
-2
No files found.
app/assets/javascripts/pipelines/services/pipelines_service.js
View file @
a1debf5c
...
...
@@ -40,6 +40,6 @@ export default class PipelinesService {
* @return {Promise}
*/
postAction
(
endpoint
)
{
return
Vue
.
http
.
post
(
endpoint
,
{},
{
emulateJSON
:
true
}
);
return
Vue
.
http
.
post
(
`
${
endpoint
}
.json`
);
}
}
app/controllers/projects/pipelines_controller.rb
View file @
a1debf5c
...
...
@@ -92,15 +92,31 @@ class Projects::PipelinesController < Projects::ApplicationController
def
retry
pipeline
.
retry_failed
(
current_user
)
respond_to
do
|
format
|
format
.
html
do
redirect_back_or_default
default:
namespace_project_pipelines_path
(
project
.
namespace
,
project
)
end
format
.
json
do
render
status:
204
end
end
end
def
cancel
pipeline
.
cancel_running
respond_to
do
|
format
|
format
.
html
do
redirect_back_or_default
default:
namespace_project_pipelines_path
(
project
.
namespace
,
project
)
end
format
.
json
do
render
status:
204
end
end
end
def
charts
@charts
=
{}
@charts
[
:week
]
=
Ci
::
Charts
::
WeekChart
.
new
(
project
)
...
...
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