diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-05-24 15:13:51 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-05-31 14:17:49 +0200 |
| commit | 161af17c1b69e7e00aefcd4f540a55755259ceda (patch) | |
| tree | 6a2c94a350a2fa53e05f07927df543ed3ba1a7bc /lib | |
| parent | 19ee16a0f85dd4bacddbd066237e62a1bbb7113a (diff) | |
| download | gitlab-ce-161af17c1b69e7e00aefcd4f540a55755259ceda.tar.gz | |
Introduce source to pipeline entitytrigger-source
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/commit_statuses.rb | 9 | ||||
| -rw-r--r-- | lib/api/pipelines.rb | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lib/api/commit_statuses.rb b/lib/api/commit_statuses.rb index 827a38d33da..10f2d5ef6a3 100644 --- a/lib/api/commit_statuses.rb +++ b/lib/api/commit_statuses.rb @@ -68,7 +68,14 @@ module API name = params[:name] || params[:context] || 'default' - pipeline = @project.ensure_pipeline(ref, commit.sha, current_user) + pipeline = @project.pipeline_for(ref, commit.sha) + unless pipeline + pipeline = @project.pipelines.create!( + source: :external, + sha: commit.sha, + ref: ref, + user: current_user) + end status = GenericCommitStatus.running_or_pending.find_or_initialize_by( project: @project, diff --git a/lib/api/pipelines.rb b/lib/api/pipelines.rb index 9117704aa46..e505cae3992 100644 --- a/lib/api/pipelines.rb +++ b/lib/api/pipelines.rb @@ -47,7 +47,7 @@ module API new_pipeline = Ci::CreatePipelineService.new(user_project, current_user, declared_params(include_missing: false)) - .execute(ignore_skip_ci: true, save_on_errors: false) + .execute(:api, ignore_skip_ci: true, save_on_errors: false) if new_pipeline.persisted? present new_pipeline, with: Entities::Pipeline else |