summaryrefslogtreecommitdiff
path: root/app/views/projects
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-04-17 23:55:40 +0000
committerRobert Speicher <robert@gitlab.com>2017-04-17 23:55:40 +0000
commit8e29af5e33d81f6f0fa68e62915fef7894187f6f (patch)
tree90b3294adca4f71c3037cb679771f2e878a754b7 /app/views/projects
parent6ab69f480551d06f68d540c07a075d5429555f21 (diff)
parente2a58aecc9050332295dd82a7b77c94d517b2448 (diff)
downloadgitlab-ce-8e29af5e33d81f6f0fa68e62915fef7894187f6f.tar.gz
Merge branch 'dm-can-modify-blob' into 'master'
Rename can_edit_blob? to can_modify_blob? See merge request !10748
Diffstat (limited to 'app/views/projects')
-rw-r--r--app/views/projects/blob/show.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/blob/show.html.haml b/app/views/projects/blob/show.html.haml
index b6738c3380f..b9b3f3ec7a3 100644
--- a/app/views/projects/blob/show.html.haml
+++ b/app/views/projects/blob/show.html.haml
@@ -8,7 +8,7 @@
#tree-holder.tree-holder
= render 'blob', blob: @blob
- - if can_edit_blob?(@blob)
+ - if can_modify_blob?(@blob)
= render 'projects/blob/remove'
- title = "Replace #{@blob.name}"