summaryrefslogtreecommitdiff
path: root/lib/support/nginx
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-07-12 13:16:04 +0000
committerRémy Coutable <remy@rymai.me>2016-07-12 13:16:04 +0000
commit179be71dc5f8c11c1ad2f668b2e681b29ca333a1 (patch)
treecca8c22f4d5ad6dc01f99a0c8080b6a7603a158c /lib/support/nginx
parent238f7c6709b4a17306bf63bf0b7f127c3ce9c0f4 (diff)
parentf1f9b5e2f0f7ab8515f263b79c09d9f98b0d302f (diff)
downloadgitlab-ce-179be71dc5f8c11c1ad2f668b2e681b29ca333a1.tar.gz
Merge branch '19702-define_show_html_vars' into 'master'
Be explicit on merge request discussion variables ## What does this MR do? To avoid conditionals and to messing with request.format and accept headers to know in which format we're going to response I've decided to be explicit in when we need the discussion variables ## Why was this MR needed? Solve a bug https://sentry.gitlap.com/gitlab/staginggitlabcom/issues/8492/ ## What are the relevant issue numbers? Closes #19702 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - ~~[ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - ~~[ ] API support added~~ - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5204
Diffstat (limited to 'lib/support/nginx')
0 files changed, 0 insertions, 0 deletions