Enhance new branch button on an issue

1 files changed, 6 insertions, 5 deletions

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 243d9a5db62..3b6bff6c577 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -95,7 +95,7 @@ class Issue < ActiveRecord::Base
   end
 
   def related_branches
-    self.project.repository.branch_names.select { |branch| /\A#{iid}-/ =~ branch }
+    self.project.repository.branch_names.select { |branch| branch.start_with? "#{iid}-" }
   end
 
   # Reset issue events cache
@@ -126,12 +126,13 @@ class Issue < ActiveRecord::Base
   end
 
   def to_branch_name
-    "#{iid}-#{title.parameterize}"[0,25]
+    "#{iid}-#{title.parameterize}"
   end
 
-  def new_branch_button?(current_user)
+  def can_be_worked_on?(current_user)
     !self.closed? &&
-    referenced_merge_requests(current_user).empty? &&
-    related_branches.empty?
+      !self.project.forked? &&
+      referenced_merge_requests(current_user).none? { |mr| mr.closes_issue?(self) } &&
+      related_branches.empty?
   end
 end