diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-04 16:47:54 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-04 16:47:54 +0400 |
| commit | 18e4e997644aa0772153938106e4fc798a12e10f (patch) | |
| tree | 5fd8c0e15471eba848bb2f26db76a327eb5958f4 /app | |
| parent | d5c569118cf3a928b3f7e77a017a0df39c2cb1f1 (diff) | |
| parent | 81336bd2b52bdbee9a1199f78e7da001814fae84 (diff) | |
Merge branch 'sha-link' of https://github.com/cirosantilli/gitlabhq into cirosantilli-sha-link
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
CHANGELOG
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/blob/_actions.html.haml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/views/projects/blob/_actions.html.haml b/app/views/projects/blob/_actions.html.haml index cabef3c19fe..8587dc4bc6d 100644 --- a/app/views/projects/blob/_actions.html.haml +++ b/app/views/projects/blob/_actions.html.haml @@ -13,6 +13,9 @@ - else = link_to "blame", project_blame_path(@project, @id), class: "btn btn-small" unless @blob.empty? = link_to "history", project_commits_path(@project, @id), class: "btn btn-small" + - if @ref != @commit.sha + = link_to 'permalink', project_blob_path(@project, + tree_join(@commit.sha, @path)), class: 'btn btn-small' - if allowed_tree_edit? = link_to '#modal-remove-blob', class: "remove-blob btn btn-small btn-remove", "data-toggle" => "modal" do |