diff options
| author | Johannes Schleifenbaum <johannes@js-webcoding.de> | 2013-10-30 11:20:43 +0100 |
|---|---|---|
| committer | Johannes Schleifenbaum <johannes@js-webcoding.de> | 2013-10-30 11:34:26 +0100 |
| commit | cc505f550da83b2073adb168bcca620f656a076b (patch) | |
| tree | 21dda30dfb8b36baf57b529361210c05eada66a0 /app/views/projects/blob/_actions.html.haml | |
| parent | ee0e9830c1c1e4c54fd0b18fadef50f76c3680a4 (diff) | |
| download | gitlab-ce-cc505f550da83b2073adb168bcca620f656a076b.tar.gz | |
Check if a file is editied "on" a branch or a commit.
The previous behavior was a "disabled" link, which was still clickable
and linked to the edit file action.
If the user accesses a path like "/edit/master/README" show the file
edit form (just like before).
If the user accesses a path like
"/edit/8d5c1f375ce99e5df84e26b0eafbf1448c6a001e/README", redirect the
user to the file detail page with a note, that he cannot edit a file
"on" a commit.
fixes #5482
Diffstat (limited to 'app/views/projects/blob/_actions.html.haml')
| -rw-r--r-- | app/views/projects/blob/_actions.html.haml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/views/projects/blob/_actions.html.haml b/app/views/projects/blob/_actions.html.haml index 5641c528a4f..f6cc62e707e 100644 --- a/app/views/projects/blob/_actions.html.haml +++ b/app/views/projects/blob/_actions.html.haml @@ -1,7 +1,10 @@ .btn-group.tree-btn-group -# only show edit link for text files - if @blob.text? - = link_to "edit", project_edit_tree_path(@project, @id), class: "btn btn-small", disabled: !allowed_tree_edit? + - if allowed_tree_edit? + = link_to "edit", project_edit_tree_path(@project, @id), class: "btn btn-small" + - else + %span.btn.btn-small.disabled Edit = link_to "raw", project_raw_path(@project, @id), class: "btn btn-small", target: "_blank" -# only show normal/blame view links for text files - if @blob.text? |