500 error when creating a merge request that removes a submodule

• Zendesk ticket: https://gitlab.zendesk.com/agent/tickets/11490
• Dev link: None
• GitLab version: 8.1.2 (reproducible on 8.1.4, too).

Expected behavior

If a submodule is removed in a commit and the user creates a merge request, the merge request should be created successfully and be mergeable.

Observed behavior

When a commit removes a submodule creating a merge request produces a 500 error. If such a commit is pushed to an existing merge request it is mergeable but the diff breaks.

The error in the logs is:

Completed 500 Internal Server Error in 484ms (ActiveRecord: 7.1ms)

ActionView::Template::Error (undefined method `path' for nil:NilClass):
    3:     - if diff_file.diff.submodule?
    4:       %span
    5:         - submodule_item = project.repository.blob_at(@commit.id, diff_file.file_path)
    6:         = submodule_link(submodule_item, @commit.id, project.repository)
    7:     - else
    8:       %span
    9:         - if diff_file.deleted_file
  app/helpers/submodule_helper.rb:6:in `submodule_links'
  app/helpers/diff_helper.rb:157:in `submodule_link'
  app/views/projects/diffs/_file.html.haml:6:in `_app_views_projects_diffs__file_html_haml___1653267349141469784_70194922535560'
  app/views/projects/diffs/_diffs.html.haml:22:in `block in _app_views_projects_diffs__diffs_html_haml__1830652150926553288_70194905898140'
  app/views/projects/diffs/_diffs.html.haml:17:in `each'
  app/views/projects/diffs/_diffs.html.haml:17:in `each_with_index'
  app/views/projects/diffs/_diffs.html.haml:17:in `_app_views_projects_diffs__diffs_html_haml__1830652150926553288_70194905898140'
  app/views/projects/merge_requests/_new_submit.html.haml:37:in `_app_views_projects_merge_requests__new_submit_html_haml___1221975262021238384_70194878935740'
  app/views/projects/merge_requests/new.html.haml:5:in `_app_views_projects_merge_requests_new_html_haml___3650664875616120466_70194878630920'

Steps to reproduce:

1. Add a submodule to a test repo.
2. Commit this to master.
3. Check out a branch.
4. Delete the submodule, including the entry from .gitmodules.
5. Commit and push.
6. Attempt to open a merge request and observe the 500 error.

cc/ @DouweM Can you please look in to this?

Additionally, the commit that removes the submodule can't be directly viewed via Gitlab, i.e. it results in a 500 error in Gitlab 8.1.2.

@dblessing I think this a duplicate of #3464 (closed)

mentioned in issue #3464 (closed)

Quick look tells me we should just use blob rather than submodule_item, but I don't have time to investigate thoroughly.

@dblessing Can you schedule this?

Milestone changed to 8.3

mentioned in issue #3503 (closed)

Here's a public repository that demonstrates the 500 when viewing the commit: https://gitlab.com/savef/submodule-deletion-demo

The broken commit: https://gitlab.com/savef/submodule-deletion-demo/commit/c3369fcb4dcb341f45216a55fc2e473d6ea60fab

. This is still present in 8.2.1. I also created a project and commit that demonstrate this problem, before coming across this issue.

Reassigned to @dbalexandre

mentioned in merge request !1989 (merged)

Status changed to closed by commit 1d605f63

mentioned in commit 1d605f63

mentioned in commit 0ece3d65

mentioned in issue #3952 (closed)

Mentioned in commit maxraab/gitlab-ce@0ece3d65