Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Mazetto <brodock@gmail.com>2017-03-17 05:48:06 +0300
committerGabriel Mazetto <brodock@gmail.com>2017-04-03 13:45:31 +0300
commit291bd873d38094d9bc9b7482566f6dee40096992 (patch)
treebfb336b445e1a4c56f4610065eebf590b02dc7c0 /lib/gitlab/github_import
parent59588ebac012e0bb300d1d7660f5a7360ace5e4e (diff)
One more change to the branch names to preserve metadata
Diffstat (limited to 'lib/gitlab/github_import')
-rw-r--r--lib/gitlab/github_import/pull_request_formatter.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/github_import/pull_request_formatter.rb b/lib/gitlab/github_import/pull_request_formatter.rb
index bc24c6de120..82be1639578 100644
--- a/lib/gitlab/github_import/pull_request_formatter.rb
+++ b/lib/gitlab/github_import/pull_request_formatter.rb
@@ -47,7 +47,7 @@ module Gitlab
end
def source_branch_name_prefixed
- "gh-#{target_branch_short_sha}/#{number}"
+ "gh-#{target_branch_short_sha}/#{number}/#{source_branch_user}/#{source_branch_ref}"
end
def source_branch_exists?
@@ -67,7 +67,7 @@ module Gitlab
end
def target_branch_name_prefixed
- "gl-#{target_branch_short_sha}/#{number}"
+ "gl-#{target_branch_short_sha}/#{number}/#{target_branch_user}/#{target_branch_ref}"
end
def cross_project?