diff options
| author | Valery Sizov <valery@gitlab.com> | 2016-06-21 11:54:34 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2016-06-21 11:54:34 +0000 |
| commit | 1ddbbf358dfbda4d080978397a9b21ddfb3d98cb (patch) | |
| tree | 866fb9cd9a93bb35c26165b622a4a2c833b07164 /app/helpers | |
| parent | 0468deafbd6fcf008eb672dd42b98390d95e8add (diff) | |
| parent | c6b4106401a2b89b3525571287b404728d824f18 (diff) | |
| download | gitlab-ce-1ddbbf358dfbda4d080978397a9b21ddfb3d98cb.tar.gz | |
Merge branch 'backport_from_ee' into 'master'
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
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/blob_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb index 16d9d7d2d5a..4b4bc3d4276 100644 --- a/app/helpers/blob_helper.rb +++ b/app/helpers/blob_helper.rb @@ -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, |