diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-19 15:06:00 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-19 15:06:00 +0300 |
| commit | b570d73ecd31e2ca9cf8c2f1adb056edf2869477 (patch) | |
| tree | 0b8aa67eab6da552d8499f1fdcf9a7495dcf1379 /lib/gitlab/github_import | |
| parent | 34b3567c97ecc0f317adae04e10e4d7d8c8830db (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/github_import')
| -rw-r--r-- | lib/gitlab/github_import/importer/issue_importer.rb | 1 | ||||
| -rw-r--r-- | lib/gitlab/github_import/importer/pull_request_importer.rb | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/lib/gitlab/github_import/importer/issue_importer.rb b/lib/gitlab/github_import/importer/issue_importer.rb index a468f6d8821..8648cbaec9d 100644 --- a/lib/gitlab/github_import/importer/issue_importer.rb +++ b/lib/gitlab/github_import/importer/issue_importer.rb @@ -52,7 +52,6 @@ module Gitlab project_id: project.id, description: description, milestone_id: milestone_finder.id_for(issue), - state: issue.state, state_id: ::Issue.available_states[issue.state], created_at: issue.created_at, updated_at: issue.updated_at diff --git a/lib/gitlab/github_import/importer/pull_request_importer.rb b/lib/gitlab/github_import/importer/pull_request_importer.rb index 377e873d24d..dc15b95505a 100644 --- a/lib/gitlab/github_import/importer/pull_request_importer.rb +++ b/lib/gitlab/github_import/importer/pull_request_importer.rb @@ -54,7 +54,6 @@ module Gitlab target_project_id: project.id, source_branch: pull_request.formatted_source_branch, target_branch: pull_request.target_branch, - state: pull_request.state, state_id: ::MergeRequest.available_states[pull_request.state], milestone_id: milestone_finder.id_for(pull_request), author_id: author_id, |