Skip to content

"Changes" tab in a merge request doesn't load the diff via Ajax - browser reload required to see the diffs

Summary

As a developer When I do merge request review And want to see the diff via "Changes" tab I can't

Steps to reproduce:

  1. Create a merge request
  2. Open a merge request using Chrome or Firefox: http://my.host.com/main/epg_importer/merge_requests/20
  3. Click "Changes" tab with a mouse (link it points to: http://my.host.com/main/epg_importer/merge_requests/20/diffs)

Expected behavior

I expect all the diffs to see after actual click. What I see is the throbber (loader) spinning for a while (few secs) and then stopping without nothing new being shown on the page

What I do as a workaround: I refresh the diffs page with CTRL+R what works obviously

Observed behavior

In Chrome development tab "Network" I actually see the ajax call being done:

Request headers:

GET /main/epg_importer/merge_requests/20/diffs HTTP/1.1
Host: my.host.com
Connection: keep-alive
Accept: application/json, text/javascript, */*; q=0.01
X-CSRF-Token: LvR4iTQfS73VhyYkOQjPnJ8wvHPvHGZrQS/L7/kLRq4=
X-Requested-With: XMLHttpRequest
User-Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.52             Safari/537.36
DNT: 1
Referer: http://my.host.com/main/epg_importer/merge_requests/20/diffs
Accept-Encoding: gzip,deflate,sdch
Accept-Language: en-GB,en-US;q=0.8,en;q=0.6
Cookie: event_filter=merged%2Ccomments%2Cteam%2Cpush; dashboard_sidebar_filter=sidebar-projects-tab;     _gitlab_session=4d73321a75c1b044ef7d2f0a027027c4;     remember_user_token=BAhbB1sGaQpJIiIkMmEkMTAkQ2pHN1c3dzFTSXRNMXNZMW02cWNWLgY6BkVU--    cc3e319d16944cde931fb9d5e047089dd22046e7; __utma=205059842.1530110960.1358763640.1405698274.1411555078.21;     __utmc=205059842; __utmz=205059842.1358763640.1.1.utmcsr=google|utmccn=(organic)|utmcmd=organic|utmctr=(not%20provided); request_method=GET
If-None-Match: "08d243e514b32058b0e1fbdd5b826cdb"

Response headers:

HTTP/1.1 304 Not Modified
Server: nginx
Date: Mon, 29 Sep 2014 12:58:50 GMT
Connection: keep-alive
Status: 304 Not Modified
X-Frame-Options: DENY
X-XSS-Protection: 1; mode=block
X-Content-Type-Options: nosniff
X-UA-Compatible: IE=edge
ETag: "08d243e514b32058b0e1fbdd5b826cdb"
Cache-Control: max-age=0, private, must-revalidate
X-Request-Id: 9f39dcea-960d-4139-bca0-4b003482a1f5
X-Runtime: 2.030922

Output of checks

Results of GitLab Application Check

all ok

Version of GitLab you are running

GitLab 7.2.0 a044c4b1

Describe your setup

git@git:~/gitlab$ bundle exec rake gitlab:env:info RAILS_ENV=production
[deprecated] I18n.enforce_available_locales will default to true in the
future. If you really want to skip validation of your locale you can set
I18n.enforce_available_locales = false to avoid this message.

System information
System:         Debian 7.6
Current User:   git
Using RVM:      no
Ruby Version:   2.1.2p95
Gem Version:    2.2.2
Bundler Version:1.7.2
Rake Version:   10.3.2
Sidekiq Version:2.17.0

GitLab information
Version:        7.2.1
Revision:       ff1633f
Directory:      /home/git/gitlab
DB Adapter:     mysql2
URL:            http://my.host.com
HTTP Clone URL: http://git.my.host.com/some-project.git
SSH Clone URL:  git@git.my.host.com:some-project.git
Using LDAP:     no
Using Omniauth: no

GitLab Shell
Version:        1.9.7
Repositories:   /my.host.com/gitlab/repositories/
Hooks:          /home/git/gitlab-shell/hooks/
Git:            /usr/bin/git

Possible fixes

n/a