summaryrefslogtreecommitdiff
path: root/app/views/projects/diffs/_file.html.haml
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-12-20 20:19:38 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-12-20 20:19:38 +0200
commite007d810c9945f13817eaa5c907a5e8a72a8a0e5 (patch)
tree901525278ffd43b5847bc702dfc3cce53106198b /app/views/projects/diffs/_file.html.haml
parent8c1be08d9f789e9a5a8cddcfefc076be1f064dd0 (diff)
parent81eacd1b2a591d3ce1f14d4119527ea9b290ba8f (diff)
downloadgitlab-ce-e007d810c9945f13817eaa5c907a5e8a72a8a0e5.tar.gz
Merge pull request #7886 from cirosantilli/disable-blob-edit-mr
Disable / hide MR edit blob button if cannot edit.
Diffstat (limited to 'app/views/projects/diffs/_file.html.haml')
-rw-r--r--app/views/projects/diffs/_file.html.haml6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/diffs/_file.html.haml b/app/views/projects/diffs/_file.html.haml
index bf7770ceedf..23e7691b32e 100644
--- a/app/views/projects/diffs/_file.html.haml
+++ b/app/views/projects/diffs/_file.html.haml
@@ -30,9 +30,9 @@
&nbsp;
- if @merge_request && @merge_request.source_project
- = link_to project_edit_tree_path(@merge_request.source_project, tree_join(@merge_request.source_branch, diff_file.new_path), from_merge_request_id: @merge_request.id), { class: 'btn btn-small' } do
- Edit
- &nbsp;
+ = edit_blob_link(@merge_request.source_project,
+ @merge_request.source_branch, diff_file.new_path,
+ after: '&nbsp;', from_merge_request_id: @merge_request.id)
= view_file_btn(@commit.id, diff_file, project)