summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-12-08 17:11:23 +0100
committerDouwe Maan <douwe@gitlab.com>2015-12-08 17:11:23 +0100
commit7aeb7077cb906933c59e5b890fd4027005e34d3d (patch)
tree8cbe115a92eb16d679be0f39ca09d6e9028d2601
parent82ddd738b672afd4ed28f12fb58f512fa117d2be (diff)
downloadgitlab-ce-edit-in-patch-branch.tar.gz
Only show Edit button for text blobs.edit-in-patch-branch
-rw-r--r--app/helpers/blob_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb
index 65bd543bf1a..68e5d5be600 100644
--- a/app/helpers/blob_helper.rb
+++ b/app/helpers/blob_helper.rb
@@ -30,7 +30,7 @@ module BlobHelper
nil
end
- return unless blob && blob_editable?(blob)
+ return unless blob && blob.text? && blob_editable?(blob)
text = 'Edit'
after = options[:after] || ''
@@ -47,7 +47,7 @@ module BlobHelper
end
def blob_editable?(blob, project = @project, ref = @ref)
- allowed_tree_edit?(project, ref) && !blob.lfs_pointer?
+ !blob.lfs_pointer? && allowed_tree_edit?(project, ref)
end
def leave_edit_message