From f801e2243dcce6d3bdce01acf62fbf5a49a301da Mon Sep 17 00:00:00 2001
From: Timothy Andrew <mail@timothyandrew.net>
Date: Tue, 19 Apr 2016 09:22:55 +0530
Subject: [PATCH] A new branch created for a confidential issue is named
`<id>-confidential-issue`.
---
app/models/issue.rb | 2 +-
spec/models/issue_spec.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 530d2107596..2f773869603 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -158,7 +158,7 @@ class Issue < ActiveRecord::Base
def to_branch_name
if self.confidential?
- "issue-#{iid}"
+ "#{iid}-confidential-issue"
else
"#{iid}-#{title.parameterize}"
end
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index da1c673653a..060e6599104 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -248,7 +248,7 @@ describe Issue, models: true do
it "does not contain the issue title if confidential" do
issue = create(:issue, title: 'testing-issue', confidential: true)
- expect(issue.to_branch_name).to match /\Aissue/
+ expect(issue.to_branch_name).to match /confidential-issue\z/
end
end
end
--
GitLab