diff options
| author | Gabriel Mazetto <gabriel@gitlab.com> | 2016-06-30 22:39:51 +0300 |
|---|---|---|
| committer | Gabriel Mazetto <gabriel@gitlab.com> | 2016-06-30 22:39:51 +0300 |
| commit | ccd439da5d919e4e96fd070ba22c41335382d723 (patch) | |
| tree | 3c2489daf198c037d6ee9ae88e6bc0c9f8bc9df5 /app/views/projects | |
| parent | c73db50cc72a9d0d2a326290e29d1edb5d721df5 (diff) | |
| parent | 0d6d8376e6038d2a0fb30f3f9916c9e3788fa275 (diff) | |
Merge branch 'build-reopen-json' into 'master'
Build path sends JSON file path
## What does this MR do?
Fixes an issue with browser caching JSON response on build page.
Steps to see:
- Open build (https://gitlab.com/gitlab-org/gitlab-ce/builds/2030226)
- Close tab
- Re-open tab
You should now see some JSON :disappointed:
This MR appends `.json` to the end of the build URL so that the browser can't cache it as the same URL.
See merge request !4935
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/builds/show.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml index 4e2702c2e44..d1c468c4692 100644 --- a/app/views/projects/builds/show.html.haml +++ b/app/views/projects/builds/show.html.haml @@ -67,4 +67,4 @@ = render "sidebar" :javascript - new CiBuild("#{namespace_project_build_url(@project.namespace, @project, @build)}", "#{@build.status}", "#{trace_with_state[:state]}") + new CiBuild("#{namespace_project_build_url(@project.namespace, @project, @build, :json)}", "#{@build.status}", "#{trace_with_state[:state]}") |