diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-06-10 17:31:21 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-06-10 17:31:21 +0300 |
| commit | 133d5c1c64b9d9265736a8b6277fcd73730c6612 (patch) | |
| tree | 154c589a076088cb42588894154c1ad15c9b1c58 /app | |
| parent | 2ff359142a08af8656f5f6ed90a65e90ecec32f2 (diff) | |
| parent | 9ba0f83d25a7ae8ad8a500f706af45de9fc469b6 (diff) | |
Merge branch 'rename-ci-commit-phase-4' into 'master'
Rename Commit to Pipeline in TriggerRequest
Changes in TriggerRequest a `commit` to `pipeline`.
See merge request !4505
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/ci/trigger_request.rb | 2 | ||||
| -rw-r--r-- | app/services/ci/create_trigger_request_service.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/ci/trigger_request.rb b/app/models/ci/trigger_request.rb index 59fc9951d11..b69ae37668c 100644 --- a/app/models/ci/trigger_request.rb +++ b/app/models/ci/trigger_request.rb @@ -3,7 +3,7 @@ module Ci extend Ci::Model belongs_to :trigger, class_name: 'Ci::Trigger' - belongs_to :commit, class_name: 'Ci::Pipeline', foreign_key: :commit_id + belongs_to :pipeline, class_name: 'Ci::Pipeline', foreign_key: :commit_id has_many :builds, class_name: 'Ci::Build' serialize :variables diff --git a/app/services/ci/create_trigger_request_service.rb b/app/services/ci/create_trigger_request_service.rb index c3194f45b10..1e629cf119a 100644 --- a/app/services/ci/create_trigger_request_service.rb +++ b/app/services/ci/create_trigger_request_service.rb @@ -11,7 +11,7 @@ module Ci trigger_request = trigger.trigger_requests.create!( variables: variables, - commit: pipeline, + pipeline: pipeline, ) if pipeline.create_builds(nil, trigger_request) |