Show tooltip when trying to edit file when not on branch

1 files changed, 8 insertions, 5 deletions

diff --git a/app/helpers/tree_helper.rb b/app/helpers/tree_helper.rb
index ac75c9a14b7..886a1e734b5 100644
--- a/app/helpers/tree_helper.rb
+++ b/app/helpers/tree_helper.rb
@@ -46,13 +46,20 @@ module TreeHelper
     File.join(*args)
   end
 
+  def on_top_of_branch?(project = @project, ref = @ref)
+    project.repository.branch_names.include?(ref)
+  end
+
   def allowed_tree_edit?(project = nil, ref = nil)
     project ||= @project
+    ref ||= @ref
+    return false unless on_top_of_branch?(project, ref)
+
     can?(current_user, :push_code, project)
   end
 
   def tree_edit_branch(project = @project, ref = @ref)
-    if allowed_tree_edit?
+    if allowed_tree_edit?(project, ref)
       if can_push_branch?(project, ref)
         ref
       else
@@ -61,10 +68,6 @@ module TreeHelper
     end
   end
 
-  def can_delete_or_replace?(blob)
-    allowed_tree_edit? && !blob.lfs_pointer?
-  end
-
   def tree_breadcrumbs(tree, max_links = 2)
     if @path.present?
       part_path = ""