We get a 500 error for some merge requests

For some merge requests we get an error in /home/git/gitlab/log/production.log:

Completed 500 Internal Server Error in 40ms

NoMethodError (undefined method commit_status' for nil:NilClass): app/controllers/projects/merge_requests_controller.rb:154:in ci_status'

Most annoying is that we don't have access to the diff page anymore after that (for that merge request only)

We upgraded today to a new ruby version: ruby-2.0.0.353-22.el7_0.x86_64. We didn't noticed the error before that.

See probably related issue #883 (closed) (https://gitlab.com/gitlab-org/gitlab-ce/issues/380#note_146801)

I don't think it's the same issue. We upgraded ruby, not gitlab.

What I meant is the other error I was having with some lost commits... Pushing your branches might solve this.

I got this issue too on GitLab 7.5.3 b656b85

It seems that this issue is browser dependent: it works in chrome, doesn't work with firefox and ie.

In the logs, when accessing the diffs from firefox we see this:

Started GET "/tools/hieradata/merge_requests/57/diffs" for 127.0.0.1 at 2015-01-01 17:07:05 -0500
Processing by Projects::MergeRequestsController#diffs as JSON
  Parameters: {"project_id"=>"tools/hieradata", "id"=>"57"}
Completed 200 OK in 1267ms (Views: 46.5ms | ActiveRecord: 12.7ms)

The source page in firefox is incomplete.

For chrome we see this in the logs:

Started GET "/tools/hieradata/merge_requests/57/diffs" for 127.0.0.1 at 2015-01-01 16:57:38 -0500
Processing by Projects::MergeRequestsController#diffs as HTML
  Parameters: {"project_id"=>"tools/hieradata", "id"=>"57"}
Completed 200 OK in 1473ms (Views: 1371.0ms | ActiveRecord: 24.2ms)

Why the processing is done as json on firefox and as html on chromium?

Status changed to closed

seems the issue is different then what i wrote on this bug. I will close it and reopen a new one.

mentioned in issue #962 (closed)