Remove new branch button for confidential issues

2 files changed, 15 insertions, 5 deletions

diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index 9fa00811af0..11636d7ebc7 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -75,7 +75,7 @@
       // This element is filled in using JavaScript.
 
   .content-block.content-block-small
-    = render 'new_branch'
+    = render 'new_branch' unless @issue.confidential?
     = render 'award_emoji/awards_block', awardable: @issue, inline: true
 
   %section.issuable-discussion
diff --git a/spec/features/issues/new_branch_button_spec.rb b/spec/features/issues/new_branch_button_spec.rb
index a4d3053d10c..83ca413efcf 100644
--- a/spec/features/issues/new_branch_button_spec.rb
+++ b/spec/features/issues/new_branch_button_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-feature 'Start new branch from an issue', feature: true do
+feature 'Start new branch from an issue', feature: true, js: true do
   let!(:project)   { create(:project) }
   let!(:issue)     { create(:issue, project: project) }
   let!(:user)      { create(:user)}
@@ -11,7 +11,7 @@ feature 'Start new branch from an issue', feature: true do
       login_as(user)
     end
 
-    it 'shows the new branch button', js: true do
+    it 'shows the new branch button' do
       visit namespace_project_issue_path(project.namespace, project, issue)
 
       expect(page).to have_css('#new-branch .available')
@@ -34,16 +34,26 @@ feature 'Start new branch from an issue', feature: true do
         visit namespace_project_issue_path(project.namespace, project, issue)
       end
 
-      it "hides the new branch button", js: true do
+      it "hides the new branch button" do
         expect(page).to have_css('#new-branch .unavailable')
         expect(page).not_to have_css('#new-branch .available')
         expect(page).to have_content /1 Related Merge Request/
       end
     end
+
+    context 'when issue is confidential' do
+      it 'hides the new branch button' do
+        issue = create(:issue, :confidential, project: project)
+
+        visit namespace_project_issue_path(project.namespace, project, issue)
+
+        expect(page).not_to have_css('#new-branch')
+      end
+    end
   end
 
   context "for visiters" do
-    it 'shows no buttons', js: true do
+    it 'shows no buttons' do
       visit namespace_project_issue_path(project.namespace, project, issue)
 
       expect(page).not_to have_css('#new-branch')