diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-12-23 11:18:46 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-12-23 11:18:46 +0000 |
| commit | a113ce48e35dafa2bd3cc774827bded360b9c6da (patch) | |
| tree | fa6267644c6445b6bb250ac1b873210979a3215d | |
| parent | 554719d985916d9f49f70b577382ab3a6da7eb7f (diff) | |
| parent | 90ed76ac3cfc64f7bfc66a90104d055ddd1bb2e7 (diff) | |
| download | gitlab-ce-a113ce48e35dafa2bd3cc774827bded360b9c6da.tar.gz | |
Merge branch 'fix-500-after-merge' into 'master'
Fix 500 on MR diff page after merge and branch was removed
Fixes #1847
See merge request !1345
| -rw-r--r-- | app/helpers/tree_helper.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/app/helpers/tree_helper.rb b/app/helpers/tree_helper.rb index 329beadbd41..e32aeba5f8f 100644 --- a/app/helpers/tree_helper.rb +++ b/app/helpers/tree_helper.rb @@ -66,7 +66,14 @@ module TreeHelper end def edit_blob_link(project, ref, path, options = {}) - if project.repository.blob_at(ref, path).text? + blob = + begin + project.repository.blob_at(ref, path) + rescue + nil + end + + if blob && blob.text? text = 'Edit' after = options[:after] || '' from_mr = options[:from_merge_request_id] |