Incorporate the review and update spec

The feature spec now also tests the absence of the new branch button

2 files changed, 13 insertions, 13 deletions

diff --git a/app/models/issue.rb b/app/models/issue.rb
index ec275d5f5b5..781298a63b2 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -87,20 +87,20 @@ class Issue < ActiveRecord::Base
   end
 
   def referenced_merge_requests(current_user = nil)
-    if defined?(@referenced_merge_requests)
-      @referenced_merge_requests[current_user] ||=  Gitlab::ReferenceExtractor.lazily do
-                                                      [self, *notes].flat_map do |note|
-                                                        note.all_references(current_user).merge_requests
-                                                      end
-                                                    end.sort_by(&:iid).uniq
-    else
-      @referenced_merge_requests = {}
-      referenced_merge_requests(current_user)
+    @referenced_merge_requests ||= {}
+    @referenced_merge_requests[current_user] ||= begin
+      Gitlab::ReferenceExtractor.lazily do
+        [self, *notes].flat_map do |note|
+          note.all_references(current_user).merge_requests
+        end
+      end.sort_by(&:iid).uniq
     end
   end
 
   def related_branches
-    self.project.repository.branch_names.select { |branch| branch.start_with? "#{iid}-" }
+    self.project.repository.branch_names.select do |branch|
+      branch =~ /\A#{iid}-(?!\d+-stable)/i
+    end
   end
 
   # Reset issue events cache
@@ -138,6 +138,6 @@ class Issue < ActiveRecord::Base
     !self.closed? &&
       !self.project.forked? &&
       self.related_branches.empty? &&
-      self.referenced_merge_requests(current_user).empty?
+      self.closed_by_merge_requests(current_user).empty?
   end
 end
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb
index 5ea7d405e4d..f09b77c4a57 100644
--- a/app/services/system_note_service.rb
+++ b/app/services/system_note_service.rb
@@ -213,9 +213,9 @@ class SystemNoteService
   #   "Started branch `201-issue-branch-button`"
   def self.new_issue_branch(issue, project, author, branch)
     h = Gitlab::Application.routes.url_helpers
-    link = "#{h.namespace_project_compare_url(project.namespace, project, from: project.default_branch, to: branch)}"
+    link = h.namespace_project_compare_url(project.namespace, project, from: project.default_branch, to: branch)
 
-    body = "Started branch [#{branch}](#{link})"
+    body = "Started branch [`#{branch}`](#{link})"
     create_note(noteable: issue, project: project, author: author, note: body)
   end