diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-08 11:36:23 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-12-09 01:15:37 +0300 |
| commit | 0ece3d65520b1b610d5c9a1cd517d7ed5f3b9821 (patch) | |
| tree | a9454ebb7f67194d26788a76f125e5e1c6201089 /app | |
| parent | 383970625366e0d44e716e1593ef50f41ec701f5 (diff) | |
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 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/views/projects/diffs/_file.html.haml b/app/views/projects/diffs/_file.html.haml index c745b4e69bf..ba4353e5f09 100644 --- a/app/views/projects/diffs/_file.html.haml +++ b/app/views/projects/diffs/_file.html.haml @@ -2,8 +2,9 @@ .diff-header{id: "file-path-#{hexdigest(diff_file.file_path)}"} - if diff_file.diff.submodule? %span - - submodule_item = project.repository.blob_at(@commit.id, diff_file.file_path) - = submodule_link(submodule_item, @commit.id, project.repository) + = icon('archive fw') + %strong + = submodule_link(blob, @commit.id, project.repository) - else %span - if diff_file.deleted_file |