home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 05:06:46 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport_from_ee' into 'master'

Browse Source 
Fix of on-hover state for 'Edit' button on tree view

It's already reviewed and merged to EE, so it's just a back-port.

See merge request !4823
This commit is contained in:
Valery Sizov
2016-06-21 11:54:34 +00:00
parent 0468deafbd c6b4106401
commit 1ddbbf358d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/helpers/blob_helper.rb
+1 -1
View File
@@ -29,7 +29,7 @@ module BlobHelper
if !on_top_of_branch?(project, ref)
button_tag "Edit", class: "btn disabled has-tooltip btn-file-option", title: "You can only edit files when you are on a branch", data: { container: 'body' }
elsif can_edit_blob?(blob, project, ref)
link_to "Edit", edit_path, class: 'btn btn-file-option'
link_to "Edit", edit_path, class: 'btn btn-sm'
elsif can?(current_user, :fork_project, project)
continue_params = {
to: edit_path,