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

Merge branch 'fix-500-after-merge' into 'master'
a113ce48 · Dmitriy Zaporozhets · 554719d9 · 90ed76ac · a113ce48
Commit a113ce48 authored Dec 23, 2014 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

tree_helper.rb app/helpers/tree_helper.rb +8 -1

No files found.
--- 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]