Default target branch to patch-n when editing file in protected branch

1 files changed, 10 insertions, 3 deletions

diff --git a/app/helpers/tree_helper.rb b/app/helpers/tree_helper.rb
index 6afa1aacc5b..ac75c9a14b7 100644
--- a/app/helpers/tree_helper.rb
+++ b/app/helpers/tree_helper.rb
@@ -48,10 +48,17 @@ module TreeHelper
 
   def allowed_tree_edit?(project = nil, ref = nil)
     project ||= @project
-    ref ||= @ref
-    return false unless project.repository.branch_names.include?(ref)
+    can?(current_user, :push_code, project)
+  end
 
-    ::Gitlab::GitAccess.new(current_user, project).can_push_to_branch?(ref)
+  def tree_edit_branch(project = @project, ref = @ref)
+    if allowed_tree_edit?
+      if can_push_branch?(project, ref)
+        ref
+      else
+        project.repository.next_patch_branch
+      end
+    end
   end
 
   def can_delete_or_replace?(blob)