diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-09-06 13:10:47 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-09-06 13:10:47 +0300 |
| commit | 0e0a4d78818c071ce89aec1619f1e6bc8c8a40af (patch) | |
| tree | 3a353f5adc9adbdbb7840b97946c0f2072f7c387 /lib/gitlab | |
| parent | ec326ecf91e893531bc2412fd4177405911e0e98 (diff) | |
| parent | ca6a1f33f91a8cceadebfb9c4e9ac6afa340f71d (diff) | |
Merge branch 'ce-detect-github-pull-requests' into 'master'
Port CreateGithubPullRequestEvents migration from EE
See merge request gitlab-org/gitlab-ce!31802
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/ci/pipeline/chain/build.rb | 1 | ||||
| -rw-r--r-- | lib/gitlab/ci/pipeline/chain/command.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/import_export/import_export.yml | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/lib/gitlab/ci/pipeline/chain/build.rb b/lib/gitlab/ci/pipeline/chain/build.rb index 164a4634d84..899df81ea5c 100644 --- a/lib/gitlab/ci/pipeline/chain/build.rb +++ b/lib/gitlab/ci/pipeline/chain/build.rb @@ -19,6 +19,7 @@ module Gitlab user: @command.current_user, pipeline_schedule: @command.schedule, merge_request: @command.merge_request, + external_pull_request: @command.external_pull_request, variables_attributes: Array(@command.variables_attributes) ) diff --git a/lib/gitlab/ci/pipeline/chain/command.rb b/lib/gitlab/ci/pipeline/chain/command.rb index afad391e8e0..58f89a6be5e 100644 --- a/lib/gitlab/ci/pipeline/chain/command.rb +++ b/lib/gitlab/ci/pipeline/chain/command.rb @@ -7,7 +7,7 @@ module Gitlab Command = Struct.new( :source, :project, :current_user, :origin_ref, :checkout_sha, :after_sha, :before_sha, :source_sha, :target_sha, - :trigger_request, :schedule, :merge_request, + :trigger_request, :schedule, :merge_request, :external_pull_request, :ignore_skip_ci, :save_incompleted, :seeds_block, :variables_attributes, :push_options, :chat_data, :allow_mirror_update diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml index bd0f3e70749..40acb24d191 100644 --- a/lib/gitlab/import_export/import_export.yml +++ b/lib/gitlab/import_export/import_export.yml @@ -64,6 +64,8 @@ project_tree: - :push_event_payload - stages: - :statuses + - :external_pull_request + - :external_pull_requests - :auto_devops - :triggers - :pipeline_schedules |