diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-04-18 19:32:23 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-04-18 19:32:23 +0000 |
| commit | 387b025d15c3e0536d37128c282e02e9025dcd75 (patch) | |
| tree | e7baa7223772a80d13e95da2e3e894ed8f5ad726 /lib | |
| parent | 09d2da20913757e5350c711ec9e20df94b022584 (diff) | |
| parent | c9f2fc3c1802aabf913df3094aebf2d020b19f2a (diff) | |
| download | gitlab-ce-387b025d15c3e0536d37128c282e02e9025dcd75.tar.gz | |
Merge branch 'gh-keep-issues-prs-references' into 'master'
Use GitHub Issue/PR number as iid to keep references
Closes #15294
See merge request !3759
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/github_import/issue_formatter.rb | 1 | ||||
| -rw-r--r-- | lib/gitlab/github_import/pull_request_formatter.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/github_import/issue_formatter.rb b/lib/gitlab/github_import/issue_formatter.rb index 1e3ba44f27c..acb332cb0cb 100644 --- a/lib/gitlab/github_import/issue_formatter.rb +++ b/lib/gitlab/github_import/issue_formatter.rb @@ -3,6 +3,7 @@ module Gitlab class IssueFormatter < BaseFormatter def attributes { + iid: number, project: project, title: raw_data.title, description: description, diff --git a/lib/gitlab/github_import/pull_request_formatter.rb b/lib/gitlab/github_import/pull_request_formatter.rb index 4e507b090e8..5ee8a14624a 100644 --- a/lib/gitlab/github_import/pull_request_formatter.rb +++ b/lib/gitlab/github_import/pull_request_formatter.rb @@ -3,6 +3,7 @@ module Gitlab class PullRequestFormatter < BaseFormatter def attributes { + iid: number, title: raw_data.title, description: description, source_project: source_project, |