diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-08 08:36:23 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-08 08:36:23 +0000 |
| commit | 1d605f63650ca7dfedb766d41cf15f33f0bd2e51 (patch) | |
| tree | 046e92d1e65fa38e0d0f5443c344e29623b37d04 /app | |
| parent | 7f90c8efcc0c8d63fadd293419be679a25e43c95 (diff) | |
| parent | f7aafd8fc8e1dd3a414e3827c42087b364ebd5a0 (diff) | |
| download | gitlab-ce-1d605f63650ca7dfedb766d41cf15f33f0bd2e51.tar.gz | |
Merge branch 'fix-merge-request-that-removes-submodule' into 'master'
Fix 500 error when creating a merge request that removes a submodule
Fixes #3476
See merge request !1989
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/diffs/_file.html.haml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/projects/diffs/_file.html.haml b/app/views/projects/diffs/_file.html.haml index b3392d00e01..b77e9f9f403 100644 --- a/app/views/projects/diffs/_file.html.haml +++ b/app/views/projects/diffs/_file.html.haml @@ -3,9 +3,8 @@ - if diff_file.diff.submodule? %span = icon('archive fw') - - submodule_item = project.repository.blob_at(@commit.id, diff_file.file_path) %strong - = submodule_link(submodule_item, @commit.id, project.repository) + = submodule_link(blob, @commit.id, project.repository) - else %span = blob_icon blob.mode, blob.name |