diff options
author | Phil Hughes <me@iamphill.com> | 2017-09-29 07:52:13 +0000 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2017-09-29 12:44:27 -0400 |
commit | 886511fd18cb3e7bf7f3853432cfe6a3a9f2a705 (patch) | |
tree | 51f6cbf641a2db8de64b0887e4335912ccb65831 /app | |
parent | 6d3bafcc18a7cdca6529b31ac19408979cac9364 (diff) | |
download | gitlab-ce-886511fd18cb3e7bf7f3853432cfe6a3a9f2a705.tar.gz |
Merge branch '38528-build-url' into 'master'
Fixes data parameter not being sent in ajax request for jobs log
Closes #38528
See merge request gitlab-org/gitlab-ce!14564
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/build.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/build.js b/app/assets/javascripts/build.js index ae1a23132a7..e85a7bc1772 100644 --- a/app/assets/javascripts/build.js +++ b/app/assets/javascripts/build.js @@ -166,7 +166,7 @@ window.Build = (function () { Build.prototype.getBuildTrace = function () { return $.ajax({ url: `${this.pageUrl}/trace.json`, - data: this.state, + data: { state: this.state }, }) .done((log) => { gl.utils.setCiStatusFavicon(`${this.pageUrl}/status.json`); |