diff options
| author | Felipe Artur <fcardozo@gitlab.com> | 2017-09-15 20:14:53 +0000 |
|---|---|---|
| committer | Felipe Artur <fcardozo@gitlab.com> | 2017-09-15 20:14:53 +0000 |
| commit | 25c959f94d3dda63120256735163e4a142b8711e (patch) | |
| tree | 4c6e544a665dab5b59106ace9638dca16b71d806 /app/models/ci/trigger_request.rb | |
| parent | b20595b2bd0023ebbc2ec46017f5d1cb1533fb4f (diff) | |
| parent | 3dd2248605ce2183f02ab268fc1f8b0b164f0bed (diff) | |
| download | gitlab-ce-issue_37640.tar.gz | |
Merge branch 'master' into 'issue_37640'issue_37640
# Conflicts:
# db/schema.rb
Diffstat (limited to 'app/models/ci/trigger_request.rb')
| -rw-r--r-- | app/models/ci/trigger_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/ci/trigger_request.rb b/app/models/ci/trigger_request.rb index 2c860598281..215b1cf6753 100644 --- a/app/models/ci/trigger_request.rb +++ b/app/models/ci/trigger_request.rb @@ -1,6 +1,6 @@ module Ci class TriggerRequest < ActiveRecord::Base - extend Ci::Model + extend Gitlab::Ci::Model belongs_to :trigger belongs_to :pipeline, foreign_key: :commit_id |