From 228007dfbcd8f97c66c1802f3b69abd7d02c7d26 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <mail@zjvandeweg.nl>
Date: Fri, 12 Feb 2016 19:42:25 +0100
Subject: new-branch-button

---
 CHANGELOG                                             |  2 ++
 app/assets/stylesheets/pages/issues.scss              |  5 +++++
 app/controllers/projects/branches_controller.rb       | 16 +++++++++++++---
 app/controllers/projects/issues_controller.rb         |  1 +
 app/models/issue.rb                                   | 14 ++++++++++++++
 app/services/merge_requests/build_service.rb          | 11 +++++++++++
 app/views/projects/issues/_merge_requests.html.haml   |  2 +-
 app/views/projects/issues/_new_branch.html.haml       |  5 +++++
 app/views/projects/issues/_related_branches.html.haml | 15 +++++++++++++++
 app/views/projects/issues/show.html.haml              |  2 ++
 spec/models/issue_spec.rb                             | 12 ++++++++++++
 11 files changed, 81 insertions(+), 4 deletions(-)
 create mode 100644 app/views/projects/issues/_new_branch.html.haml
 create mode 100644 app/views/projects/issues/_related_branches.html.haml

diff --git a/CHANGELOG b/CHANGELOG
index 7f076f70c7c..fe65e7b34fc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -175,6 +175,8 @@ v 8.5.0
   - Add label description (Nuttanart Pornprasitsakul)
   - Show label row when filtering issues or merge requests by label (Nuttanart Pornprasitsakul)
   - Add Todos
+  - User project limit is reached notice is hidden if the projects limit is zero 
+  - New branch button appears on issues where applicable (Zeger-Jan van de Weg)
 
 v 8.4.5
   - No CE-specific changes
diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss
index 1b686c58eaf..5f1810cbaf6 100644
--- a/app/assets/stylesheets/pages/issues.scss
+++ b/app/assets/stylesheets/pages/issues.scss
@@ -49,6 +49,11 @@ form.edit-issue {
   margin: 0;
 }
 
+.related-branches-title {
+    font-size: 16px;
+    font-weight: 600;
+}
+
 .merge-requests-title {
   font-size: 16px;
   font-weight: 600;
diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb
index 4db3b3bf23d..cf68f50b1f9 100644
--- a/app/controllers/projects/branches_controller.rb
+++ b/app/controllers/projects/branches_controller.rb
@@ -9,7 +9,7 @@ class Projects::BranchesController < Projects::ApplicationController
     @sort = params[:sort] || 'name'
     @branches = @repository.branches_sorted_by(@sort)
     @branches = Kaminari.paginate_array(@branches).page(params[:page]).per(PER_PAGE)
-    
+
     @max_commits = @branches.reduce(0) do |memo, branch|
       diverging_commit_counts = repository.diverging_commit_counts(branch)
       [memo, diverging_commit_counts[:behind], diverging_commit_counts[:ahead]].max
@@ -23,8 +23,7 @@ class Projects::BranchesController < Projects::ApplicationController
   def create
     branch_name = sanitize(strip_tags(params[:branch_name]))
     branch_name = Addressable::URI.unescape(branch_name)
-    ref = sanitize(strip_tags(params[:ref]))
-    ref = Addressable::URI.unescape(ref)
+
     result = CreateBranchService.new(project, current_user).
         execute(branch_name, ref)
 
@@ -49,4 +48,15 @@ class Projects::BranchesController < Projects::ApplicationController
       format.js { render status: status[:return_code] }
     end
   end
+
+  private
+
+  def ref
+    if params[:ref]
+      ref_escaped = sanitize(strip_tags(params[:ref]))
+      Addressable::URI.unescape(ref_escaped)
+    else
+      @project.default_branch
+    end
+  end
 end
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index b0a03ee45cc..aa7a178dcf4 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -65,6 +65,7 @@ class Projects::IssuesController < Projects::ApplicationController
     @notes = @issue.notes.nonawards.with_associations.fresh
     @noteable = @issue
     @merge_requests = @issue.referenced_merge_requests(current_user)
+    @related_branches = @issue.related_branches - @merge_requests.map(&:source_branch)
 
     respond_with(@issue)
   end
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 5f58c0508fd..243d9a5db62 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -94,6 +94,10 @@ class Issue < ActiveRecord::Base
     end.sort_by(&:iid)
   end
 
+  def related_branches
+    self.project.repository.branch_names.select { |branch| /\A#{iid}-/ =~ branch }
+  end
+
   # Reset issue events cache
   #
   # Since we do cache @event we need to reset cache in special cases:
@@ -120,4 +124,14 @@ class Issue < ActiveRecord::Base
       note.all_references(current_user).merge_requests
     end.uniq.select { |mr| mr.open? && mr.closes_issue?(self) }
   end
+
+  def to_branch_name
+    "#{iid}-#{title.parameterize}"[0,25]
+  end
+
+  def new_branch_button?(current_user)
+    !self.closed? &&
+    referenced_merge_requests(current_user).empty? &&
+    related_branches.empty?
+  end
 end
diff --git a/app/services/merge_requests/build_service.rb b/app/services/merge_requests/build_service.rb
index 954746a39a5..8f1b735b8df 100644
--- a/app/services/merge_requests/build_service.rb
+++ b/app/services/merge_requests/build_service.rb
@@ -47,6 +47,17 @@ module MergeRequests
         merge_request.title = merge_request.source_branch.titleize.humanize
       end
 
+      # When your branch name starts with an iid followed by a dash this pattern will
+      # be interpreted as the use wants to close that issue on this project
+      # Pattern example: 112-fix-mep-mep
+      # Will lead to appending `Closes #112` to the description
+      if merge_request.source_branch =~ /\A\d+-/
+        closes_issue = "Closes ##{Regexp.last_match(0)[0...-1]}"
+        closes_issue.prepend("\n") if merge_request.description.present?
+
+        merge_request.description << closes_issue
+      end
+
       merge_request
     end
 
diff --git a/app/views/projects/issues/_merge_requests.html.haml b/app/views/projects/issues/_merge_requests.html.haml
index d9868ad1f0a..d6b38b327ff 100644
--- a/app/views/projects/issues/_merge_requests.html.haml
+++ b/app/views/projects/issues/_merge_requests.html.haml
@@ -1,4 +1,4 @@
--if @merge_requests.any?
+- if @merge_requests.any?
   %h2.merge-requests-title
     = pluralize(@merge_requests.count, 'Related Merge Request')
   %ul.unstyled-list
diff --git a/app/views/projects/issues/_new_branch.html.haml b/app/views/projects/issues/_new_branch.html.haml
new file mode 100644
index 00000000000..4d5fa61a91a
--- /dev/null
+++ b/app/views/projects/issues/_new_branch.html.haml
@@ -0,0 +1,5 @@
+- if current_user && can?(current_user, :push_code, @project) && @issue.new_branch_button?(current_user)
+  .pull-right
+    = link_to namespace_project_branches_path(@project.namespace, @project, branch_name: @issue.to_branch_name), method: :post, class: 'btn' do
+      = icon('code-fork')
+      New Branch
diff --git a/app/views/projects/issues/_related_branches.html.haml b/app/views/projects/issues/_related_branches.html.haml
new file mode 100644
index 00000000000..56387661989
--- /dev/null
+++ b/app/views/projects/issues/_related_branches.html.haml
@@ -0,0 +1,15 @@
+- if @related_branches.any?
+  %h2.related-branches-title
+    = pluralize(@related_branches.count, 'Related Branch')
+  %ul.unstyled-list
+    - @related_branches.each do |branch|
+      %li
+        - sha = @project.repository.find_branch(branch).target
+        - ci_commit = @project.ci_commit(sha) if sha
+        - if ci_commit
+          %span.related-branch-ci-status
+            = render_ci_status(ci_commit)
+        %span.related-branch-info
+          %strong
+            = link_to namespace_project_compare_path(@project.namespace, @project, from: @project.default_branch, to: branch) do
+              = branch
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index 0242276cd84..1e8308277cc 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -70,8 +70,10 @@
 
       .merge-requests
         = render 'merge_requests'
+        = render 'related_branches'
 
     .content-block.content-block-small
+      = render 'new_branch'
       = render 'votes/votes_block', votable: @issue
 
     .row
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index 7f44ca2f7db..d572a71cf46 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -140,4 +140,16 @@ describe Issue, models: true do
   it_behaves_like 'a Taskable' do
     let(:subject) { create :issue }
   end
+
+  describe "#to_branch_name" do
+    let(:issue) { build(:issue, title: 'a' * 30) }
+
+    it "is expected not to exceed 25 chars" do
+      expect(issue.to_branch_name.length).to eq 25
+    end
+
+    it "starts with the issue iid" do
+      expect(issue.to_branch_name).to match /\A#{issue.iid}-a+\z/
+    end
+  end
 end
-- 
cgit v1.2.1


From ad97bebfed2e65951c7dc39ee80b32089a032804 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <mail@zjvandeweg.nl>
Date: Wed, 17 Feb 2016 07:11:48 +0100
Subject: Enhance new branch button on an issue

---
 app/controllers/projects/branches_controller.rb    |  6 ++
 app/models/issue.rb                                | 11 +--
 app/services/merge_requests/build_service.rb       | 12 ++-
 app/services/system_note_service.rb                |  9 +++
 app/views/projects/issues/_new_branch.html.haml    |  4 +-
 .../projects/branches_controller_spec.rb           | 91 +++++++++++++---------
 spec/models/issue_spec.rb                          |  4 -
 spec/services/system_note_service_spec.rb          | 12 +++
 8 files changed, 99 insertions(+), 50 deletions(-)

diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb
index cf68f50b1f9..bcbd3aa5d9b 100644
--- a/app/controllers/projects/branches_controller.rb
+++ b/app/controllers/projects/branches_controller.rb
@@ -27,6 +27,12 @@ class Projects::BranchesController < Projects::ApplicationController
     result = CreateBranchService.new(project, current_user).
         execute(branch_name, ref)
 
+    if params[:issue_id]
+      issue = Issue.where(id: params[:issue_id], project: @project).limit(1).first
+
+      SystemNoteService.new_issue_branch(issue, @project, current_user, branch_name)
+    end
+
     if result[:status] == :success
       @branch = result[:branch]
       redirect_to namespace_project_tree_path(@project.namespace, @project,
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
diff --git a/app/services/merge_requests/build_service.rb b/app/services/merge_requests/build_service.rb
index 8f1b735b8df..fa34753c4fd 100644
--- a/app/services/merge_requests/build_service.rb
+++ b/app/services/merge_requests/build_service.rb
@@ -51,11 +51,15 @@ module MergeRequests
       # be interpreted as the use wants to close that issue on this project
       # Pattern example: 112-fix-mep-mep
       # Will lead to appending `Closes #112` to the description
-      if merge_request.source_branch =~ /\A\d+-/
-        closes_issue = "Closes ##{Regexp.last_match(0)[0...-1]}"
-        closes_issue.prepend("\n") if merge_request.description.present?
+      if match = merge_request.source_branch.match(/\A(\d+)-/)
+        iid = match[1]
+        closes_issue = "Closes ##{iid}"
 
-        merge_request.description << closes_issue
+        if merge_request.description.present?
+          merge_request.description << closes_issue.prepend("\n")
+        else
+          merge_request.description = closes_issue
+        end
       end
 
       merge_request
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb
index 58a861ee08e..751815c5b18 100644
--- a/app/services/system_note_service.rb
+++ b/app/services/system_note_service.rb
@@ -207,6 +207,15 @@ class SystemNoteService
     create_note(noteable: noteable, project: project, author: author, note: body)
   end
 
+  # Called when a branch is created from the 'new branch' button on a issue
+  # Example note text:
+  #
+  #   "Started branch `201-issue-branch-button`"
+  def self.new_issue_branch(issue, project, author, branch)
+    body = "Started branch `#{branch}`"
+    create_note(noteable: issue, project: project, author: author, note: body)
+  end
+
   # Called when a Mentionable references a Noteable
   #
   # noteable  - Noteable object being referenced
diff --git a/app/views/projects/issues/_new_branch.html.haml b/app/views/projects/issues/_new_branch.html.haml
index 4d5fa61a91a..a6b97b90e64 100644
--- a/app/views/projects/issues/_new_branch.html.haml
+++ b/app/views/projects/issues/_new_branch.html.haml
@@ -1,5 +1,5 @@
-- if current_user && can?(current_user, :push_code, @project) && @issue.new_branch_button?(current_user)
+- if current_user && can?(current_user, :push_code, @project) && @issue.can_be_worked_on?(current_user)
   .pull-right
-    = link_to namespace_project_branches_path(@project.namespace, @project, branch_name: @issue.to_branch_name), method: :post, class: 'btn' do
+    = link_to namespace_project_branches_path(@project.namespace, @project, branch_name: @issue.to_branch_name, issue_id: @issue.id), method: :post, class: 'btn', title: @issue.to_branch_name do
       = icon('code-fork')
       New Branch
diff --git a/spec/controllers/projects/branches_controller_spec.rb b/spec/controllers/projects/branches_controller_spec.rb
index 8e06d4bdc77..b509714e75c 100644
--- a/spec/controllers/projects/branches_controller_spec.rb
+++ b/spec/controllers/projects/branches_controller_spec.rb
@@ -17,49 +17,70 @@ describe Projects::BranchesController do
   describe "POST create" do
     render_views
 
-    before do
-      post :create,
-        namespace_id: project.namespace.to_param,
-        project_id: project.to_param,
-        branch_name: branch,
-        ref: ref
-    end
+    context "on creation of a new branch" do
+      before do
+        post :create,
+          namespace_id: project.namespace.to_param,
+          project_id: project.to_param,
+          branch_name: branch,
+          ref: ref
+      end
 
-    context "valid branch name, valid source" do
-      let(:branch) { "merge_branch" }
-      let(:ref) { "master" }
-      it 'redirects' do
-        expect(subject).
-          to redirect_to("/#{project.path_with_namespace}/tree/merge_branch")
+      context "valid branch name, valid source" do
+        let(:branch) { "merge_branch" }
+        let(:ref) { "master" }
+        it 'redirects' do
+          expect(subject).
+            to redirect_to("/#{project.path_with_namespace}/tree/merge_branch")
+        end
       end
-    end
 
-    context "invalid branch name, valid ref" do
-      let(:branch) { "<script>alert('merge');</script>" }
-      let(:ref) { "master" }
-      it 'redirects' do
-        expect(subject).
-          to redirect_to("/#{project.path_with_namespace}/tree/alert('merge');")
+      context "invalid branch name, valid ref" do
+        let(:branch) { "<script>alert('merge');</script>" }
+        let(:ref) { "master" }
+        it 'redirects' do
+          expect(subject).
+            to redirect_to("/#{project.path_with_namespace}/tree/alert('merge');")
+        end
       end
-    end
 
-    context "valid branch name, invalid ref" do
-      let(:branch) { "merge_branch" }
-      let(:ref) { "<script>alert('ref');</script>" }
-      it { is_expected.to render_template('new') }
-    end
+      context "valid branch name, invalid ref" do
+        let(:branch) { "merge_branch" }
+        let(:ref) { "<script>alert('ref');</script>" }
+        it { is_expected.to render_template('new') }
+      end
+
+      context "invalid branch name, invalid ref" do
+        let(:branch) { "<script>alert('merge');</script>" }
+        let(:ref) { "<script>alert('ref');</script>" }
+        it { is_expected.to render_template('new') }
+      end
 
-    context "invalid branch name, invalid ref" do
-      let(:branch) { "<script>alert('merge');</script>" }
-      let(:ref) { "<script>alert('ref');</script>" }
-      it { is_expected.to render_template('new') }
+      context "valid branch name with encoded slashes" do
+        let(:branch) { "feature%2Ftest" }
+        let(:ref) { "<script>alert('ref');</script>" }
+        it { is_expected.to render_template('new') }
+        it { project.repository.branch_names.include?('feature/test') }
+      end
     end
 
-    context "valid branch name with encoded slashes" do
-      let(:branch) { "feature%2Ftest" }
-      let(:ref) { "<script>alert('ref');</script>" }
-      it { is_expected.to render_template('new') }
-      it { project.repository.branch_names.include?('feature/test')}
+    describe "created from the new branch button on issues" do
+      let(:branch) { "1-feature-branch" }
+      let!(:issue) { create(:issue) }
+
+      before do
+        post :create,
+          namespace_id: project.namespace.to_param,
+          project_id: project.to_param,
+          branch_name: branch,
+          issue_id: issue.id
+        end
+
+      it 'redirects' do
+        expect(subject).
+          to redirect_to("/#{project.path_with_namespace}/tree/1-feature-branch")
+      end
+
     end
   end
 
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index d572a71cf46..97b2db2fba5 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -144,10 +144,6 @@ describe Issue, models: true do
   describe "#to_branch_name" do
     let(:issue) { build(:issue, title: 'a' * 30) }
 
-    it "is expected not to exceed 25 chars" do
-      expect(issue.to_branch_name.length).to eq 25
-    end
-
     it "starts with the issue iid" do
       expect(issue.to_branch_name).to match /\A#{issue.iid}-a+\z/
     end
diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb
index 5dcc39f5fdc..2730b42c612 100644
--- a/spec/services/system_note_service_spec.rb
+++ b/spec/services/system_note_service_spec.rb
@@ -280,6 +280,18 @@ describe SystemNoteService, services: true do
     end
   end
 
+  describe '.new_issue_branch' do
+    subject { described_class.new_issue_branch(noteable, project, author, "1-mepmep") }
+
+    it_behaves_like 'a system note'
+
+    context 'when a branch is created from the new branch button' do
+      it 'sets the note text' do
+        expect(subject.note).to eq 'Started branch 1-mepmep'
+      end
+    end
+  end
+
   describe '.cross_reference' do
     subject { described_class.cross_reference(noteable, mentioner, author) }
 
-- 
cgit v1.2.1


From e831a3b869cbb82e9a4294a5f9309ba56df46589 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <zegerjan@gitlab.com>
Date: Fri, 19 Feb 2016 11:58:02 +0100
Subject: Link in the note when started a new branch from an issue

---
 app/services/system_note_service.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb
index 751815c5b18..b65ac47bce3 100644
--- a/app/services/system_note_service.rb
+++ b/app/services/system_note_service.rb
@@ -212,7 +212,10 @@ class SystemNoteService
   #
   #   "Started branch `201-issue-branch-button`"
   def self.new_issue_branch(issue, project, author, branch)
-    body = "Started branch `#{branch}`"
+    h = Gitlab::Application.routes.url_helpers
+    link = "#{Gitlab.config.gitlab.url}#{h.namespace_project_compare_path(project.namespace, project, from: project.default_branch, to: branch)}"
+
+    body = "Started branch [#{branch}](#{link})"
     create_note(noteable: issue, project: project, author: author, note: body)
   end
 
-- 
cgit v1.2.1


From 2b97c921196a7be904bfe4f0a31347c3583c9e88 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <zegerjan@gitlab.com>
Date: Mon, 22 Feb 2016 09:20:04 +0100
Subject: Incorporate review

---
 CHANGELOG                                          |  3 +-
 app/assets/stylesheets/pages/issues.scss           |  7 +--
 app/controllers/projects/branches_controller.rb    |  7 ++-
 app/models/issue.rb                                | 19 +++++---
 app/services/system_note_service.rb                |  2 +-
 app/views/projects/issues/_new_branch.html.haml    |  2 +-
 .../projects/issues/_related_branches.html.haml    |  2 +-
 .../projects/branches_controller_spec.rb           | 19 +++++---
 spec/features/issues/new_branch_button_spec.rb     | 50 ++++++++++++++++++++++
 spec/models/issue_spec.rb                          |  9 ++++
 10 files changed, 93 insertions(+), 27 deletions(-)
 create mode 100644 spec/features/issues/new_branch_button_spec.rb

diff --git a/CHANGELOG b/CHANGELOG
index fe65e7b34fc..563a5966400 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -59,6 +59,7 @@ v 8.5.3
   - Show commit message in JIRA mention comment
   - Makes issue page and merge request page usable on mobile browsers.
   - Improved UI for profile settings
+  - New branch button appears on issues where applicable
 
 v 8.5.2
   - Fix sidebar overlapping content when screen width was below 1200px
@@ -175,8 +176,6 @@ v 8.5.0
   - Add label description (Nuttanart Pornprasitsakul)
   - Show label row when filtering issues or merge requests by label (Nuttanart Pornprasitsakul)
   - Add Todos
-  - User project limit is reached notice is hidden if the projects limit is zero 
-  - New branch button appears on issues where applicable (Zeger-Jan van de Weg)
 
 v 8.4.5
   - No CE-specific changes
diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss
index 5f1810cbaf6..0f2e14d1a20 100644
--- a/app/assets/stylesheets/pages/issues.scss
+++ b/app/assets/stylesheets/pages/issues.scss
@@ -49,12 +49,7 @@ form.edit-issue {
   margin: 0;
 }
 
-.related-branches-title {
-    font-size: 16px;
-    font-weight: 600;
-}
-
-.merge-requests-title {
+.merge-requests-title, .related-branches-title {
   font-size: 16px;
   font-weight: 600;
 }
diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb
index bcbd3aa5d9b..43ea717cbd2 100644
--- a/app/controllers/projects/branches_controller.rb
+++ b/app/controllers/projects/branches_controller.rb
@@ -27,10 +27,9 @@ class Projects::BranchesController < Projects::ApplicationController
     result = CreateBranchService.new(project, current_user).
         execute(branch_name, ref)
 
-    if params[:issue_id]
-      issue = Issue.where(id: params[:issue_id], project: @project).limit(1).first
-
-      SystemNoteService.new_issue_branch(issue, @project, current_user, branch_name)
+    if params[:issue_iid]
+      issue = @project.issues.find_by(iid: params[:issue_iid])
+      SystemNoteService.new_issue_branch(issue, @project, current_user, branch_name) if issue
     end
 
     if result[:status] == :success
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 3b6bff6c577..ec275d5f5b5 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -87,11 +87,16 @@ class Issue < ActiveRecord::Base
   end
 
   def referenced_merge_requests(current_user = nil)
-    Gitlab::ReferenceExtractor.lazily do
-      [self, *notes].flat_map do |note|
-        note.all_references(current_user).merge_requests
-      end
-    end.sort_by(&:iid)
+    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)
+    end
   end
 
   def related_branches
@@ -132,7 +137,7 @@ class Issue < ActiveRecord::Base
   def can_be_worked_on?(current_user)
     !self.closed? &&
       !self.project.forked? &&
-      referenced_merge_requests(current_user).none? { |mr| mr.closes_issue?(self) } &&
-      related_branches.empty?
+      self.related_branches.empty? &&
+      self.referenced_merge_requests(current_user).empty?
   end
 end
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb
index b65ac47bce3..5ea7d405e4d 100644
--- a/app/services/system_note_service.rb
+++ b/app/services/system_note_service.rb
@@ -213,7 +213,7 @@ class SystemNoteService
   #   "Started branch `201-issue-branch-button`"
   def self.new_issue_branch(issue, project, author, branch)
     h = Gitlab::Application.routes.url_helpers
-    link = "#{Gitlab.config.gitlab.url}#{h.namespace_project_compare_path(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})"
     create_note(noteable: issue, project: project, author: author, note: body)
diff --git a/app/views/projects/issues/_new_branch.html.haml b/app/views/projects/issues/_new_branch.html.haml
index a6b97b90e64..e66e4669d48 100644
--- a/app/views/projects/issues/_new_branch.html.haml
+++ b/app/views/projects/issues/_new_branch.html.haml
@@ -1,5 +1,5 @@
 - if current_user && can?(current_user, :push_code, @project) && @issue.can_be_worked_on?(current_user)
   .pull-right
-    = link_to namespace_project_branches_path(@project.namespace, @project, branch_name: @issue.to_branch_name, issue_id: @issue.id), method: :post, class: 'btn', title: @issue.to_branch_name do
+    = link_to namespace_project_branches_path(@project.namespace, @project, branch_name: @issue.to_branch_name, issue_iid: @issue.iid), method: :post, class: 'btn', title: @issue.to_branch_name do
       = icon('code-fork')
       New Branch
diff --git a/app/views/projects/issues/_related_branches.html.haml b/app/views/projects/issues/_related_branches.html.haml
index 56387661989..b10cd03515f 100644
--- a/app/views/projects/issues/_related_branches.html.haml
+++ b/app/views/projects/issues/_related_branches.html.haml
@@ -11,5 +11,5 @@
             = render_ci_status(ci_commit)
         %span.related-branch-info
           %strong
-            = link_to namespace_project_compare_path(@project.namespace, @project, from: @project.default_branch, to: branch) do
+            = link_to namespace_project_compare_path(@project.namespace, @project, from: @project.default_branch, to: branch), class: "label-branch" do
               = branch
diff --git a/spec/controllers/projects/branches_controller_spec.rb b/spec/controllers/projects/branches_controller_spec.rb
index b509714e75c..98ae424ed7c 100644
--- a/spec/controllers/projects/branches_controller_spec.rb
+++ b/spec/controllers/projects/branches_controller_spec.rb
@@ -66,21 +66,30 @@ describe Projects::BranchesController do
 
     describe "created from the new branch button on issues" do
       let(:branch) { "1-feature-branch" }
-      let!(:issue) { create(:issue) }
+      let!(:issue) { create(:issue, project: project) }
 
-      before do
+
+      it 'redirects' do
         post :create,
           namespace_id: project.namespace.to_param,
           project_id: project.to_param,
           branch_name: branch,
-          issue_id: issue.id
-        end
+          issue_iid: issue.iid
 
-      it 'redirects' do
         expect(subject).
           to redirect_to("/#{project.path_with_namespace}/tree/1-feature-branch")
       end
 
+      it 'posts a system note' do
+        expect(SystemNoteService).to receive(:new_issue_branch).with(issue, project, user, "1-feature-branch")
+
+        post :create,
+          namespace_id: project.namespace.to_param,
+          project_id: project.to_param,
+          branch_name: branch,
+          issue_iid: issue.iid
+      end
+
     end
   end
 
diff --git a/spec/features/issues/new_branch_button_spec.rb b/spec/features/issues/new_branch_button_spec.rb
new file mode 100644
index 00000000000..f47d7a5471b
--- /dev/null
+++ b/spec/features/issues/new_branch_button_spec.rb
@@ -0,0 +1,50 @@
+require 'rails_helper'
+
+feature 'Start new branch from an issue', feature: true do
+  let!(:project)   { create(:project) }
+  let!(:issue)     { create(:issue, project: project) }
+  let!(:user)      { create(:user)}
+
+  context "for team members" do
+    before do
+      project.team << [user, :master]
+      login_as(user)
+    end
+
+    it 'shown the new branch button', js: false do
+      visit namespace_project_issue_path(project.namespace, project, issue)
+
+      expect(page).to have_link "New Branch"
+    end
+
+    context "when there is a referenced merge request" do
+      let(:note) do 
+        create(:note, :on_issue, :system, project: project,
+                                          note: "mentioned in !#{referenced_mr.iid}") 
+      end
+      let(:referenced_mr) do 
+        create(:merge_request, source_project: project,
+                               target_project: project,
+                               description: "Fixes ##{issue.iid}") 
+      end
+
+      before do
+        issue.notes << note
+
+        visit namespace_project_issue_path(project.namespace, project, issue)
+      end
+
+      it "hides the new branch button", js: true do
+        expect(page).not_to have_link "New Branch"
+        expect(page).to have_content /1 Related Merge Request/
+      end
+    end
+  end
+
+  context "for visiters" do
+    it 'no button is shown', js: false do
+      visit namespace_project_issue_path(project.namespace, project, issue)
+      expect(page).not_to have_link "New Branch"
+    end
+  end
+end
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index 97b2db2fba5..2ccdec1eeff 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -130,6 +130,15 @@ describe Issue, models: true do
     end
   end
 
+  describe '#related_branches' do
+    it "should " do
+      allow(subject.project.repository).to receive(:branch_names).
+                                    and_return(["mpempe", "#{subject.iid}mepmep", subject.to_branch_name])
+
+      expect(subject.related_branches).to eq [subject.to_branch_name]
+    end
+  end
+
   it_behaves_like 'an editable mentionable' do
     subject { create(:issue) }
 
-- 
cgit v1.2.1


From 48274581551b73575149463be0c050f6b5a564ee Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <zegerjan@gitlab.com>
Date: Tue, 15 Mar 2016 20:17:51 +0100
Subject: Incorporate the review and update spec

The feature spec now also tests the absence of the new branch button
---
 CHANGELOG                                      |  2 +-
 app/models/issue.rb                            | 22 +++++++++++-----------
 app/services/system_note_service.rb            |  4 ++--
 spec/features/issues/new_branch_button_spec.rb | 11 +++++------
 spec/services/system_note_service_spec.rb      |  2 +-
 5 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 563a5966400..b4a0bea736d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@ v 8.6.0 (unreleased)
   - Bump gitlab_git to 9.0.3 (Stan Hu)
   - Support Golang subpackage fetching (Stan Hu)
   - Bump Capybara gem to 2.6.2 (Stan Hu)
+  - New branch button appears on issues where applicable
   - Contributions to forked projects are included in calendar
   - Improve the formatting for the user page bio (Connor Shea)
   - Removed the default password from the initial admin account created during
@@ -59,7 +60,6 @@ v 8.5.3
   - Show commit message in JIRA mention comment
   - Makes issue page and merge request page usable on mobile browsers.
   - Improved UI for profile settings
-  - New branch button appears on issues where applicable
 
 v 8.5.2
   - Fix sidebar overlapping content when screen width was below 1200px
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
 
diff --git a/spec/features/issues/new_branch_button_spec.rb b/spec/features/issues/new_branch_button_spec.rb
index f47d7a5471b..462cb1f8f62 100644
--- a/spec/features/issues/new_branch_button_spec.rb
+++ b/spec/features/issues/new_branch_button_spec.rb
@@ -18,14 +18,13 @@ feature 'Start new branch from an issue', feature: true do
     end
 
     context "when there is a referenced merge request" do
-      let(:note) do 
+      let(:note) do
         create(:note, :on_issue, :system, project: project,
-                                          note: "mentioned in !#{referenced_mr.iid}") 
+                                          note: "mentioned in !#{referenced_mr.iid}")
       end
-      let(:referenced_mr) do 
-        create(:merge_request, source_project: project,
-                               target_project: project,
-                               description: "Fixes ##{issue.iid}") 
+      let(:referenced_mr) do
+        create(:merge_request, :simple, source_project: project, target_project: project,
+                                description: "Fixes ##{issue.iid}")
       end
 
       before do
diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb
index 2730b42c612..8e6292014d4 100644
--- a/spec/services/system_note_service_spec.rb
+++ b/spec/services/system_note_service_spec.rb
@@ -287,7 +287,7 @@ describe SystemNoteService, services: true do
 
     context 'when a branch is created from the new branch button' do
       it 'sets the note text' do
-        expect(subject.note).to eq 'Started branch 1-mepmep'
+        expect(subject.note).to match /\AStarted branch [`1-mepmep`]/
       end
     end
   end
-- 
cgit v1.2.1


From 9337406671755ebd9175866cd86f1d6da4265d49 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <zegerjan@gitlab.com>
Date: Thu, 17 Mar 2016 11:48:07 +0100
Subject: Fix specs

Spinach was right, I was a fool..
---
 app/models/issue.rb                            | 1 +
 spec/features/issues/new_branch_button_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 781298a63b2..2447f860c5a 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -98,6 +98,7 @@ class Issue < ActiveRecord::Base
   end
 
   def related_branches
+    return [] if self.project.empty_repo?
     self.project.repository.branch_names.select do |branch|
       branch =~ /\A#{iid}-(?!\d+-stable)/i
     end
diff --git a/spec/features/issues/new_branch_button_spec.rb b/spec/features/issues/new_branch_button_spec.rb
index 462cb1f8f62..1f3bd915f48 100644
--- a/spec/features/issues/new_branch_button_spec.rb
+++ b/spec/features/issues/new_branch_button_spec.rb
@@ -24,7 +24,7 @@ feature 'Start new branch from an issue', feature: true do
       end
       let(:referenced_mr) do
         create(:merge_request, :simple, source_project: project, target_project: project,
-                                description: "Fixes ##{issue.iid}")
+                                        description: "Fixes ##{issue.iid}")
       end
 
       before do
-- 
cgit v1.2.1