diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-12-23 11:22:12 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-12-23 11:22:12 +0200 |
commit | 90ed76ac3cfc64f7bfc66a90104d055ddd1bb2e7 (patch) | |
tree | 53d0fc4ebcb3be606da4fbe3e4361ae4e175fce9 /app/helpers/tree_helper.rb | |
parent | f3d7bf63f1b53aafdc335f7294de39f2757310bf (diff) | |
download | gitlab-ce-90ed76ac3cfc64f7bfc66a90104d055ddd1bb2e7.tar.gz |
Prevent 500 after merge MR if you check remove source branch
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/helpers/tree_helper.rb')
-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] |