diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-04-17 23:55:40 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-04-17 23:55:40 +0000 |
| commit | 8e29af5e33d81f6f0fa68e62915fef7894187f6f (patch) | |
| tree | 90b3294adca4f71c3037cb679771f2e878a754b7 | |
| parent | 6ab69f480551d06f68d540c07a075d5429555f21 (diff) | |
| parent | e2a58aecc9050332295dd82a7b77c94d517b2448 (diff) | |
| download | gitlab-ce-8e29af5e33d81f6f0fa68e62915fef7894187f6f.tar.gz | |
Merge branch 'dm-can-modify-blob' into 'master'
Rename can_edit_blob? to can_modify_blob?
See merge request !10748
| -rw-r--r-- | app/helpers/blob_helper.rb | 6 | ||||
| -rw-r--r-- | app/views/projects/blob/show.html.haml | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb index 6c3f3a61e0a..4b3ab03a69c 100644 --- a/app/helpers/blob_helper.rb +++ b/app/helpers/blob_helper.rb @@ -34,7 +34,7 @@ module BlobHelper if !on_top_of_branch?(project, ref) button_tag 'Edit', class: "#{common_classes} disabled has-tooltip", title: "You can only edit files when you are on a branch", data: { container: 'body' } # This condition applies to anonymous or users who can edit directly - elsif !current_user || (current_user && can_edit_blob?(blob, project, ref)) + elsif !current_user || (current_user && can_modify_blob?(blob, project, ref)) link_to 'Edit', edit_path(project, ref, path, options), class: "#{common_classes} btn-sm" elsif current_user && can?(current_user, :fork_project, project) button_tag 'Edit', class: "#{common_classes} js-edit-blob-link-fork-toggler" @@ -52,7 +52,7 @@ module BlobHelper button_tag label, class: "btn btn-#{btn_class} disabled has-tooltip", title: "You can only #{action} files when you are on a branch", data: { container: 'body' } elsif blob.lfs_pointer? button_tag label, class: "btn btn-#{btn_class} disabled has-tooltip", title: "It is not possible to #{action} files that are stored in LFS using the web interface", data: { container: 'body' } - elsif can_edit_blob?(blob, project, ref) + elsif can_modify_blob?(blob, project, ref) button_tag label, class: "btn btn-#{btn_class}", 'data-target' => "#modal-#{modal_type}-blob", 'data-toggle' => 'modal' elsif can?(current_user, :fork_project, project) continue_params = { @@ -90,7 +90,7 @@ module BlobHelper ) end - def can_edit_blob?(blob, project = @project, ref = @ref) + def can_modify_blob?(blob, project = @project, ref = @ref) !blob.lfs_pointer? && can_edit_tree?(project, ref) end diff --git a/app/views/projects/blob/show.html.haml b/app/views/projects/blob/show.html.haml index b6738c3380f..b9b3f3ec7a3 100644 --- a/app/views/projects/blob/show.html.haml +++ b/app/views/projects/blob/show.html.haml @@ -8,7 +8,7 @@ #tree-holder.tree-holder = render 'blob', blob: @blob - - if can_edit_blob?(@blob) + - if can_modify_blob?(@blob) = render 'projects/blob/remove' - title = "Replace #{@blob.name}" |