diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-13 16:05:43 +0200 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-13 16:05:43 +0200 |
commit | 0fab7b11baf9971d0f82bbe234720e0bbaf22b6e (patch) | |
tree | c95214c24a44cc4f1d71e56363ba870d1c0645da /lib/ci | |
parent | bb3fc8c72c2a3af7873cabf9ae3e951376e7ac9e (diff) | |
parent | 57ebd3996eb5d8ff85c5899c7a7f351272655562 (diff) | |
download | gitlab-ce-0fab7b11baf9971d0f82bbe234720e0bbaf22b6e.tar.gz |
Merge remote-tracking branch 'origin/master' into artifacts-when
Diffstat (limited to 'lib/ci')
-rw-r--r-- | lib/ci/api/entities.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ci/api/entities.rb b/lib/ci/api/entities.rb index b25e0e573a8..a902ced35d7 100644 --- a/lib/ci/api/entities.rb +++ b/lib/ci/api/entities.rb @@ -56,7 +56,7 @@ module Ci class TriggerRequest < Grape::Entity expose :id, :variables - expose :commit, using: Commit + expose :pipeline, using: Commit, as: :commit end end end |