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
2b407b91
Commit
2b407b91
authored
Sep 28, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes data parameter not being sent in ajax request for jobs log
parent
7689c3ec
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
1 deletion
+20
-1
app/assets/javascripts/build.js
app/assets/javascripts/build.js
+1
-1
changelogs/unreleased/38528-build-url.yml
changelogs/unreleased/38528-build-url.yml
+5
-0
spec/javascripts/build_spec.js
spec/javascripts/build_spec.js
+14
-0
No files found.
app/assets/javascripts/build.js
View file @
2b407b91
...
@@ -167,7 +167,7 @@ window.Build = (function () {
...
@@ -167,7 +167,7 @@ window.Build = (function () {
Build
.
prototype
.
getBuildTrace
=
function
()
{
Build
.
prototype
.
getBuildTrace
=
function
()
{
return
$
.
ajax
({
return
$
.
ajax
({
url
:
`
${
this
.
pageUrl
}
/trace.json`
,
url
:
`
${
this
.
pageUrl
}
/trace.json`
,
data
:
this
.
state
,
data
:
{
state
:
this
.
state
}
,
})
})
.
done
((
log
)
=>
{
.
done
((
log
)
=>
{
setCiStatusFavicon
(
`
${
this
.
pageUrl
}
/status.json`
);
setCiStatusFavicon
(
`
${
this
.
pageUrl
}
/status.json`
);
...
...
changelogs/unreleased/38528-build-url.yml
0 → 100644
View file @
2b407b91
---
title
:
Fixes data parameter not being sent in ajax request for jobs log
merge_request
:
author
:
type
:
fixed
spec/javascripts/build_spec.js
View file @
2b407b91
...
@@ -289,4 +289,18 @@ describe('Build', () => {
...
@@ -289,4 +289,18 @@ describe('Build', () => {
});
});
});
});
});
});
describe
(
'
getBuildTrace
'
,
()
=>
{
it
(
'
should request build trace with state parameter
'
,
(
done
)
=>
{
spyOn
(
jQuery
,
'
ajax
'
).
and
.
callThrough
();
new
Build
();
setTimeout
(()
=>
{
expect
(
jQuery
.
ajax
).
toHaveBeenCalledWith
(
{
url
:
`
${
BUILD_URL
}
/trace.json`
,
data
:
{
state
:
''
}
},
);
done
();
},
0
);
});
});
});
});
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